Update to 2.4.9 - rhbz#1114377
This commit is contained in:
parent
b04baa4752
commit
3b2f2d33a9
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ OpenCV-2.1.0.tar.bz2
|
|||||||
/opencv-2.4.5-clean.tar.xz
|
/opencv-2.4.5-clean.tar.xz
|
||||||
/opencv-clean-2.4.6.1.tar.xz
|
/opencv-clean-2.4.6.1.tar.xz
|
||||||
/opencv-clean-2.4.7.tar.xz
|
/opencv-clean-2.4.7.tar.xz
|
||||||
|
/opencv-clean-2.4.9.tar.xz
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff -up opencv-2.4.7/modules/ts/CMakeLists.txt.ts_static opencv-2.4.7/modules/ts/CMakeLists.txt
|
|
||||||
--- opencv-2.4.7/modules/ts/CMakeLists.txt.ts_static 2013-11-06 15:26:39.000000000 +0100
|
|
||||||
+++ opencv-2.4.7/modules/ts/CMakeLists.txt 2013-11-14 21:28:28.289051531 +0100
|
|
||||||
@@ -4,7 +4,7 @@ if(IOS)
|
|
||||||
ocv_module_disable(ts)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-set(OPENCV_MODULE_TYPE STATIC)
|
|
||||||
+#set(OPENCV_MODULE_TYPE STATIC)
|
|
||||||
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
|
|
||||||
|
|
||||||
if(HAVE_CUDA)
|
|
12
opencv-2.4.9-ts_static.patch
Normal file
12
opencv-2.4.9-ts_static.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up opencv-2.4.9/modules/ts/CMakeLists.txt.ts_static opencv-2.4.9/modules/ts/CMakeLists.txt
|
||||||
|
--- opencv-2.4.9/modules/ts/CMakeLists.txt.ts_static 2014-04-11 05:15:26.000000000 -0500
|
||||||
|
+++ opencv-2.4.9/modules/ts/CMakeLists.txt 2014-06-29 12:49:29.473910506 -0500
|
||||||
|
@@ -4,7 +4,7 @@ if(IOS)
|
||||||
|
ocv_module_disable(ts)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-set(OPENCV_MODULE_TYPE STATIC)
|
||||||
|
+#set(OPENCV_MODULE_TYPE STATIC)
|
||||||
|
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
|
||||||
|
|
||||||
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
|
18
opencv.spec
18
opencv.spec
@ -1,25 +1,25 @@
|
|||||||
#global indice a
|
#global indice a
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 2.4.7
|
Version: 2.4.9
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
# This is normal three clause BSD.
|
# This is normal three clause BSD.
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://opencv.org
|
URL: http://opencv.org
|
||||||
# Need to remove SIFT/SURF from source tarball, due to legal concerns
|
# Need to remove SIFT/SURF from source tarball, due to legal concerns
|
||||||
# rm -rf opencv-%%{version}/modules/nonfree/src/sift.cpp
|
# rm -f opencv-%%{version}/modules/nonfree/src/sift.cpp
|
||||||
# rm -rf opencv-%%{version}/modules/nonfree/src/surf.cpp
|
# rm -f opencv-%%{version}/modules/nonfree/src/surf.cpp
|
||||||
# Removed because we don't use pre-built contribs
|
# Removed because we don't use pre-built contribs
|
||||||
# rm -rf 3rdparty
|
# rm -rf 3rdparty
|
||||||
#Source0: http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.tar.gz
|
#Source0: http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.zip
|
||||||
Source0: %{name}-clean-%{version}%{?indice}.tar.xz
|
Source0: %{name}-clean-%{version}%{?indice}.tar.xz
|
||||||
Source1: opencv-samples-Makefile
|
Source1: opencv-samples-Makefile
|
||||||
Patch0: opencv-pkgcmake.patch
|
Patch0: opencv-pkgcmake.patch
|
||||||
#http://code.opencv.org/issues/2720
|
#http://code.opencv.org/issues/2720
|
||||||
Patch2: OpenCV-2.4.4-pillow.patch
|
Patch2: OpenCV-2.4.4-pillow.patch
|
||||||
Patch3: opencv-2.4.7-ts_static.patch
|
Patch3: opencv-2.4.9-ts_static.patch
|
||||||
# fix/simplify cmake config install location (upstreamable)
|
# fix/simplify cmake config install location (upstreamable)
|
||||||
# https://bugzilla.redhat.com/1031312
|
# https://bugzilla.redhat.com/1031312
|
||||||
Patch4: opencv-2.4.7-cmake_paths.patch
|
Patch4: opencv-2.4.7-cmake_paths.patch
|
||||||
@ -133,6 +133,7 @@ pushd build
|
|||||||
%cmake CMAKE_VERBOSE=1 \
|
%cmake CMAKE_VERBOSE=1 \
|
||||||
-DPYTHON_PACKAGES_PATH=%{python_sitearch} \
|
-DPYTHON_PACKAGES_PATH=%{python_sitearch} \
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
-DCMAKE_SKIP_RPATH=ON \
|
||||||
|
-DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \
|
||||||
%ifnarch x86_64 ia64
|
%ifnarch x86_64 ia64
|
||||||
-DENABLE_SSE=0 \
|
-DENABLE_SSE=0 \
|
||||||
-DENABLE_SSE2=0 \
|
-DENABLE_SSE2=0 \
|
||||||
@ -207,7 +208,7 @@ popd
|
|||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc doc/license.txt
|
%doc LICENSE
|
||||||
%{_bindir}/opencv_*
|
%{_bindir}/opencv_*
|
||||||
%{_libdir}/libopencv_calib3d.so.2.4*
|
%{_libdir}/libopencv_calib3d.so.2.4*
|
||||||
%{_libdir}/libopencv_contrib.so.2.4*
|
%{_libdir}/libopencv_contrib.so.2.4*
|
||||||
@ -249,6 +250,9 @@ popd
|
|||||||
%{python2_sitearch}/cv2.so
|
%{python2_sitearch}/cv2.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 03 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.4.9-1
|
||||||
|
- Update to 2.4.9
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.7-7
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.7-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user