Attachment 913205 Details for Bug 1114377 – update to 2.4.9

[patch] update to 2.4.9

0001-2.4.9.patch (text/plain), 4.43 KB, created by Rex Dieter on 2014-06-29 19:42:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rex Dieter

Created: 2014-06-29 19:42:04 UTC

Size: 4.43 KB

patch

obsolete

>From 7c107c4fdc5a5dd02a0c8c080b6b388f05b46d2f Mon Sep 17 00:00:00 2001
>From: Rex Dieter <rdieter@math.unl.edu>
>Date: Sun, 29 Jun 2014 14:41:03 -0500
>Subject: [PATCH] 2.4.9
>
>---
> opencv-2.4.7-ts_static.patch | 12 ------------
> opencv-2.4.9-ts_static.patch | 12 ++++++++++++
> opencv.spec                  | 22 +++++++++++++---------
> sources                      |  1 -
> 4 files changed, 25 insertions(+), 22 deletions(-)
> delete mode 100644 opencv-2.4.7-ts_static.patch
> create mode 100644 opencv-2.4.9-ts_static.patch
>
>diff --git a/opencv-2.4.7-ts_static.patch b/opencv-2.4.7-ts_static.patch
>deleted file mode 100644
>index 099a2bf..0000000
>--- a/opencv-2.4.7-ts_static.patch
>+++ /dev/null
>@@ -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)
>diff --git a/opencv-2.4.9-ts_static.patch b/opencv-2.4.9-ts_static.patch
>new file mode 100644
>index 0000000..f1b1c81
>--- /dev/null
>+++ b/opencv-2.4.9-ts_static.patch
>@@ -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)
>diff --git a/opencv.spec b/opencv.spec
>index 1b9b55f..50b0916 100644
>--- a/opencv.spec
>+++ b/opencv.spec
>@@ -1,25 +1,23 @@
> #global indice   a
> 
> Name:           opencv
>-Version:        2.4.7
>-Release:        7%{?dist}
>+Version:        2.4.9
>+Release:        1%{?dist}
> Summary:        Collection of algorithms for computer vision
> Group:          Development/Libraries
> # This is normal three clause BSD.
> License:        BSD
> URL:            http://opencv.org
> # Need to remove SIFT/SURF from source tarball, due to legal concerns
>-# rm -rf opencv-%%{version}/modules/nonfree/src/sift.cpp
>-# rm -rf opencv-%%{version}/modules/nonfree/src/surf.cpp
>-# Removed because we don't use pre-built contribs
>-# rm -rf 3rdparty
>-#Source0:        http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.tar.gz
>+# rm -f opencv-%%{version}/modules/nonfree/src/sift.cpp
>+# rm -f opencv-%%{version}/modules/nonfree/src/surf.cpp
>+#Source0:        http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.zip
> Source0:	%{name}-clean-%{version}%{?indice}.tar.xz
> Source1:        opencv-samples-Makefile
> Patch0:         opencv-pkgcmake.patch
> #http://code.opencv.org/issues/2720
> 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)
> # https://bugzilla.redhat.com/1031312
> Patch4:         opencv-2.4.7-cmake_paths.patch
>@@ -123,6 +121,8 @@ This package contains Python bindings for the OpenCV library.
> # fix dos end of lines
> sed -i 's|\r||g'  samples/c/adaptiveskindetector.cpp
> 
>+rm -rfv 3rdparty/
>+
> 
> %build
> # enabled by default if libraries are presents at build time:
>@@ -133,6 +133,7 @@ pushd build
> %cmake CMAKE_VERBOSE=1 \
>  -DPYTHON_PACKAGES_PATH=%{python_sitearch} \
>  -DCMAKE_SKIP_RPATH=ON \
>+ -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \
> %ifnarch x86_64 ia64
>  -DENABLE_SSE=0 \
>  -DENABLE_SSE2=0 \
>@@ -207,7 +208,7 @@ popd
> %postun -p /sbin/ldconfig
> 
> %files
>-%doc doc/license.txt
>+%doc LICENSE
> %{_bindir}/opencv_*
> %{_libdir}/libopencv_calib3d.so.2.4*
> %{_libdir}/libopencv_contrib.so.2.4*
>@@ -249,6 +250,9 @@ popd
> %{python2_sitearch}/cv2.so
> 
> %changelog
>+* Sun Jun 29 2014 Rex Dieter <rdieter@fedoraproject.org> 2.4.9-1
>+- 2.4.9
>+
> * 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
> 
>diff --git a/sources b/sources
>index 456cca3..e69de29 100644
>--- a/sources
>+++ b/sources
>@@ -1 +0,0 @@
>-b540d75cdc7695098ab19fc7f56fd267  opencv-clean-2.4.7.tar.xz
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1114377: 913205 | 963926 | 963927 | 1024357