Enable VA
Do not use -f on rm because it silences errors Opencv sub-package don't need ldconfig because don't have any so
This commit is contained in:
parent
eaccdf2d88
commit
0083d782bb
|
@ -1,17 +0,0 @@
|
||||||
diff -urNp old/CMakeLists.txt new/CMakeLists.txt
|
|
||||||
--- old/CMakeLists.txt 2016-12-23 13:54:44.000000000 +0100
|
|
||||||
+++ new/CMakeLists.txt 2017-02-27 08:56:04.504933013 +0100
|
|
||||||
@@ -402,12 +402,7 @@ else()
|
|
||||||
ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
|
|
||||||
|
|
||||||
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
|
|
||||||
- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
|
|
||||||
- if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
|
||||||
- ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
|
|
||||||
- else()
|
|
||||||
- ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
|
|
||||||
- endif()
|
|
||||||
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/OpenCV)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include")
|
|
28
opencv.spec
28
opencv.spec
|
@ -34,7 +34,7 @@
|
||||||
%bcond_with libmfx
|
%bcond_with libmfx
|
||||||
%endif
|
%endif
|
||||||
%bcond_without clp
|
%bcond_without clp
|
||||||
%bcond_with va
|
%bcond_without va
|
||||||
|
|
||||||
%global srcname opencv
|
%global srcname opencv
|
||||||
%global abiver 3.4
|
%global abiver 3.4
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 3.4.1
|
Version: 3.4.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
# This is normal three clause BSD.
|
# This is normal three clause BSD.
|
||||||
License: BSD
|
License: BSD
|
||||||
|
@ -62,7 +62,7 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz
|
||||||
# fix/simplify cmake config install location (upstreamable)
|
# fix/simplify cmake config install location (upstreamable)
|
||||||
# https://bugzilla.redhat.com/1031312
|
# https://bugzilla.redhat.com/1031312
|
||||||
Patch1: opencv-3.4.1-cmake_paths.patch
|
Patch1: opencv-3.4.1-cmake_paths.patch
|
||||||
Patch2: opencv-3.4.1-cmake_va_intel_fix.patch
|
Patch2: opencv-3.4.1-cmake_va_intel_fix.patch
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: cmake >= 2.6.3
|
BuildRequires: cmake >= 2.6.3
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
|
@ -100,8 +100,6 @@ BuildRequires: pylint
|
||||||
BuildRequires: python2-numpy
|
BuildRequires: python2-numpy
|
||||||
BuildRequires: python3-numpy
|
BuildRequires: python3-numpy
|
||||||
BuildRequires: swig >= 1.3.24
|
BuildRequires: swig >= 1.3.24
|
||||||
# opencv now uses doxygen
|
|
||||||
#BuildRequires: python2-sphinx
|
|
||||||
%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
%{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel}
|
%{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel}
|
||||||
|
@ -225,14 +223,16 @@ to provide decent performance and stability.
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a1
|
%setup -q -a1
|
||||||
# we don't use pre-built contribs
|
# we don't use pre-built contribs
|
||||||
rm -rf 3rdparty/
|
rm -r 3rdparty/
|
||||||
# missing dependecies for dnn module in Fedora (protobuf-cpp)
|
# missing dependecies for dnn module in Fedora (protobuf-cpp)
|
||||||
rm -rf modules/dnn/
|
rm -r modules/dnn/
|
||||||
|
|
||||||
%patch1 -p1 -b .cmake_paths
|
%patch1 -p1 -b .cmake_paths
|
||||||
%patch2 -p1
|
%patch2 -p1 -b .va_intel
|
||||||
|
|
||||||
pushd %{name}_contrib-%{version}
|
pushd %{name}_contrib-%{version}
|
||||||
# missing dependecies for dnn_modern module in Fedora (tiny-dnn)
|
# missing dependecies for dnn_modern module in Fedora (tiny-dnn)
|
||||||
rm -rf modules/dnn_modern/
|
rm -r modules/dnn_modern/
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# fix dos end of lines
|
# fix dos end of lines
|
||||||
|
@ -271,8 +271,8 @@ pushd build
|
||||||
} \
|
} \
|
||||||
%{?with_openni: -DWITH_OPENNI=ON } \
|
%{?with_openni: -DWITH_OPENNI=ON } \
|
||||||
%{!?with_xine: -DWITH_XINE=OFF } \
|
%{!?with_xine: -DWITH_XINE=OFF } \
|
||||||
-DBUILD_EXAMPLES=ON \
|
|
||||||
-DBUILD_DOCS=ON \
|
-DBUILD_DOCS=ON \
|
||||||
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DINSTALL_C_EXAMPLES=ON \
|
-DINSTALL_C_EXAMPLES=ON \
|
||||||
-DINSTALL_PYTHON_EXAMPLES=ON \
|
-DINSTALL_PYTHON_EXAMPLES=ON \
|
||||||
-DENABLE_PYLINT=ON \
|
-DENABLE_PYLINT=ON \
|
||||||
|
@ -312,10 +312,9 @@ popd
|
||||||
|
|
||||||
%ldconfig_scriptlets core
|
%ldconfig_scriptlets core
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
|
||||||
|
|
||||||
%ldconfig_scriptlets contrib
|
%ldconfig_scriptlets contrib
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.md
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
@ -395,6 +394,11 @@ popd
|
||||||
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 08 2018 Sérgio Basto <sergio@serjux.com> - 3.4.1-2
|
||||||
|
- Enable VA
|
||||||
|
- Do not use -f on rm because it silences errors
|
||||||
|
- Opencv sub-package don't need ldconfig because don't have any so
|
||||||
|
|
||||||
* Thu Mar 01 2018 Josef Ridky <jridky@redhat.com> - 3.4.1-1
|
* Thu Mar 01 2018 Josef Ridky <jridky@redhat.com> - 3.4.1-1
|
||||||
- Spec clean up (remove Group tag, add ldconfig scriptlets, escape macros in comments)
|
- Spec clean up (remove Group tag, add ldconfig scriptlets, escape macros in comments)
|
||||||
- Remove unused patch
|
- Remove unused patch
|
||||||
|
|
Loading…
Reference in New Issue