rpms
/
opencv
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.4.4 beta

Browse Source
epel9
Nicolas Chauvet 12 years ago
parent bf18a5b82b
commit 4071339704
6 changed files with 39 additions and 64 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -5,3 +5,4 @@ OpenCV-2.1.0.tar.bz2
/OpenCV-2.4.1.tar.bz2 /OpenCV-2.4.1.tar.bz2
/OpenCV-2.4.2.tar.bz2 /OpenCV-2.4.2.tar.bz2
/OpenCV-2.4.3.tar.bz2 /OpenCV-2.4.3.tar.bz2
/OpenCV-2.4.4-beta.tar.bz2

27
OpenCV-2.4.3-codecs.patch
Unescape View File

@ -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;
}

25
OpenCV-2.4.4-pillow.patch
Unescape View File

@ -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):

26
opencv-pillow.patch
Unescape View File

@ -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):

22
opencv.spec
Unescape View File

@ -1,11 +1,11 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?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)")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global tar_name OpenCV %global tar_name OpenCV
#global indice a %global indice -beta
Name: opencv Name: opencv
Version: 2.4.3 Version: 2.4.4
Release: 7%{?dist} Release: 0.1.beta%{?dist}
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
Group: Development/Libraries Group: Development/Libraries
@ -17,9 +17,7 @@ Source1: opencv-samples-Makefile
Patch0: opencv-pkgcmake.patch Patch0: opencv-pkgcmake.patch
Patch1: opencv-pkgcmake2.patch Patch1: opencv-pkgcmake2.patch
#http://code.opencv.org/issues/2720 #http://code.opencv.org/issues/2720
Patch2: opencv-pillow.patch Patch2: OpenCV-2.4.4-pillow.patch
#http://code.opencv.org/issues/2721
Patch3: OpenCV-2.4.3-codecs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool BuildRequires: libtool
@ -56,7 +54,7 @@ BuildRequires: tbb-devel
} }
BuildRequires: zlib-devel, pkgconfig BuildRequires: zlib-devel, pkgconfig
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-imaging, numpy, swig >= 1.3.24 BuildRequires: numpy, swig >= 1.3.24
BuildRequires: python-sphinx BuildRequires: python-sphinx
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9} %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
%{!?_without_gstreamer:BuildRequires: gstreamer-devel gstreamer-plugins-base-devel} %{!?_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 Summary: Python bindings for apps which use OpenCV
Group: Development/Libraries Group: Development/Libraries
Requires: opencv = %{version}-%{release} Requires: opencv = %{version}-%{release}
Requires: python-imaging
Requires: numpy Requires: numpy
%description python %description python
@ -106,7 +103,6 @@ This package contains Python bindings for the OpenCV library.
%patch0 -p1 -b .pkgcmake %patch0 -p1 -b .pkgcmake
%patch1 -p1 -b .pkgcmake2 %patch1 -p1 -b .pkgcmake2
%patch2 -p1 -b .pillow %patch2 -p1 -b .pillow
%patch3 -p1 -b .codecs
# fix dos end of lines # fix dos end of lines
sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp
@ -128,6 +124,7 @@ pushd build
%{!?_with_sse3:-DENABLE_SSE3=0} \ %{!?_with_sse3:-DENABLE_SSE3=0} \
-DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \
-DBUILD_TEST=1 \ -DBUILD_TEST=1 \
-DBUILD_opencv_java=0 \
%{?_with_ttb: %{?_with_ttb:
%ifarch %{ix86} x86_64 ia64 %ifarch %{ix86} x86_64 ia64
-DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \ -DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \
@ -224,7 +221,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel-docs %files devel-docs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/opencv_tutorials.pdf
%doc doc/*.{htm,png,jpg} %doc doc/*.{htm,png,jpg}
%doc %{_datadir}/OpenCV/samples %doc %{_datadir}/OpenCV/samples
%doc %{_datadir}/opencv/samples %doc %{_datadir}/opencv/samples
@ -236,6 +232,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Feb 18 2013 Nicolas Chauvet <kwizart@gmail.com> - 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 <hhorak@redhat.com> - 2.4.3-7 * Fri Jan 25 2013 Honza Horak <hhorak@redhat.com> - 2.4.3-7
- Do not build with 1394 libs in rhel - Do not build with 1394 libs in rhel

2
sources
Unescape View File

@ -1 +1 @@
c0a5af4ff9d0d540684c0bf00ef35dbe OpenCV-2.4.3.tar.bz2 eec1f1afe7b0b4a95d72336c8eaef996 OpenCV-2.4.4-beta.tar.bz2

Write Preview
Loading…
Cancel
Save