Browse Source

modified to build on Vine6.5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10959 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 7 years ago
parent
commit
731638dbda
1 changed files with 22 additions and 1 deletions
  1. 22 1
      o/opencv/opencv-vl.spec

+ 22 - 1
o/opencv/opencv-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           opencv
 Version:        2.4.9
-Release:        7%{?_dist_release}
+Release:        8%{?_dist_release}
 Summary:        Collection of algorithms for computer vision
 Summary(ja):    コンピュータビジョン用のアルゴリズム集
 
@@ -40,7 +40,11 @@ BuildRequires:  libtool
 BuildRequires:  cmake >= 2.6.3
 BuildRequires:  chrpath
 
+%if "%{?_dist_release}" == "vl6"
+BuildRequires:  eigen2-devel
+%else
 BuildRequires:  eigen3-devel
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
@@ -50,7 +54,9 @@ BuildRequires:  jasper-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
+%if "%{?_dist_release}" != "vl6"
 BuildRequires:  libv4l-devel
+%endif
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  OpenEXR-devel
@@ -59,9 +65,11 @@ BuildRequires:  OpenEXR-devel
 #BuildRequires:  openni-primesense
 #endif
 
+%if "%{?_dist_release}" != "vl6"
 %ifarch %{ix86} x86_64 ia64 ppc ppc64
 BuildRequires:  tbb-devel
 %endif
+%endif
 
 BuildRequires:  zlib-devel pkgconfig
 BuildRequires:  python-devel
@@ -70,8 +78,13 @@ BuildRequires:  swig >= 1.3.24
 BuildRequires:  python-sphinx
 #BuildRequires:  ffmpeg-devel >= 0.4.9
 
+%if "%{?_dist_release}" == "vl6"
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+%else
 BuildRequires:  gstreamer1-devel
 BuildRequires:  gstreamer1-plugins-base-devel
+%endif
 #BuildRequires:  xine-lib-devel
 #BuildRequires:  opencl-headers
 
@@ -167,8 +180,12 @@ pushd build
        -DWITH_GSTREAMER_1_X=1 \
        -DWITH_OPENGL=1 \
        -DWITH_OPENMP=1 \
+%if "%{?_dist_release}" == "vl6"
+       -DWITH_V4L=0 \
+%else
 %ifarch %{ix86} x86_64 ia64
        -DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \
+%endif
 %endif
        -DWITH_XINE=0 \
        -DINSTALL_C_EXAMPLES=1 \
@@ -279,6 +296,10 @@ rm -rf %{buildroot}
 %{python_sitearch}/cv2.so
 
 %changelog
+* Mon Mar 27 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-8
+- use eigen2 on Vine Linux 6.x
+- disable tbb/v4l on Vine Linux 6.x
+
 * Fri Sep 02 2016 Toshiaki Ara <ara_t@384.jp> 2.4.9-7
 - rebuild with gcc-5.4.0