[arch-commits] Commit in opencv/repos (3 files)

Ray Rashif schiv at archlinux.org
Fri Jul 10 16:18:22 UTC 2015


    Date: Friday, July 10, 2015 @ 18:18:21
  Author: schiv
Revision: 242083

archrelease: copy trunk to staging-i686

Added:
  opencv/repos/staging-i686/
  opencv/repos/staging-i686/PKGBUILD
    (from rev 242081, opencv/trunk/PKGBUILD)
  opencv/repos/staging-i686/fsh.patch
    (from rev 242081, opencv/trunk/fsh.patch)

-----------+
 PKGBUILD  |  108 +++++++++++++++++++++++++++++++++++++++++++++++
 fsh.patch |  136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)

Copied: opencv/repos/staging-i686/PKGBUILD (from rev 242081, opencv/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-07-10 16:18:21 UTC (rev 242083)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-samples')
+_contrib=opencv_contrib
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.org/"
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394'
+          'gtkglext' 'libwebp' 'libgphoto2')
+makedepends=('cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen' 'git')
+optdepends=('opencv-samples'
+            'eigen2'
+            'libcl: For coding with OpenCL'
+            'python2-numpy: Python 2.x interface'
+            'python-numpy: Python 3.x interface')
+source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
+        "$_contrib-$pkgver::git+https://github.com/Itseez/$_contrib.git#tag=$pkgver")
+md5sums=('09004c275d8092cbdf5b61675cecd399'
+         'SKIP')
+
+_cmakeopts=('-D WITH_OPENGL=ON'
+            '-D WITH_TBB=ON'
+            '-D WITH_XINE=ON'
+            '-D WITH_GSTREAMER=OFF'
+            '-D BUILD_WITH_DEBUG_INFO=OFF'
+            '-D BUILD_TESTS=OFF'
+            '-D BUILD_PERF_TESTS=OFF'
+            '-D INSTALL_TESTS=ON'
+            '-D INSTALL_C_EXAMPLES=ON'
+            '-D INSTALL_PYTHON_EXAMPLES=ON'
+            "-D OPENCV_EXTRA_MODULES_PATH=$srcdir/$_contrib/modules"
+            '-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON')
+
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+  _cmakeopts+=('-D ENABLE_SSE=OFF'
+               '-D ENABLE_SSE2=OFF'
+               '-D ENABLE_SSE3=OFF')
+
+# all x64 CPUs support SSE2 but not SSE3
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
+
+#prepare() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#
+#  # TODO: this is mostly upstream frei0r; they hardcode the path
+#  #msg2 "Hack-fixing folder naming inconsistency (downstream)"
+#  # see http://code.opencv.org/issues/2512
+#  # and https://bugs.archlinux.org/task/32342
+#  #patch -Np1 -i "$srcdir/fsh.patch"
+#
+#  # no longer including docs, see https://bugs.archlinux.org/task/34185
+#  # python2 compatibility for generating (html) docs
+#  #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+#}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export LDFLAGS+=",-z,noexecstack"
+  cmake ${_cmakeopts[@]} .
+  make
+}
+
+package_opencv() {
+  options=('staticlibs')
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # install license file
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  cd "$pkgdir/usr/share"
+
+  # separate samples package; also be -R friendly
+  if [[ -d OpenCV/samples ]]; then
+    mv OpenCV/samples "$srcdir/$pkgname-samples"
+    mv OpenCV $pkgname # otherwise folder naming is inconsistent
+  elif [[ ! -d OpenCV ]]; then
+    warning "Directory naming issue; samples package may not be built!"
+  fi
+}
+
+package_opencv-samples() {
+  pkgdesc+=" (samples)"
+  depends=("opencv=$pkgver") # sample codes change with lib/API
+  unset optdepends
+
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+
+  # install license file
+  install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: opencv/repos/staging-i686/fsh.patch (from rev 242081, opencv/trunk/fsh.patch)
===================================================================
--- staging-i686/fsh.patch	                        (rev 0)
+++ staging-i686/fsh.patch	2015-07-10 16:18:21 UTC (rev 242083)
@@ -0,0 +1,136 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:54.923577113 +0000
+@@ -46,7 +46,7 @@
+ 
+   #need better solution....
+   if(libpath MATCHES "3rdparty")
+-    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
++    set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
+   else()
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake	2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVModule.cmake	2013-11-12 20:35:37.805415871 +0000
+@@ -807,7 +807,7 @@
+   if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
+     file(GLOB sample_files "${samples_path}/*")
+     install(FILES ${sample_files}
+-            DESTINATION share/OpenCV/samples/${module_id}
++            DESTINATION share/opencv/samples/${module_id}
+             PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+   endif()
+ endfunction()
+diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
+--- opencv-2.4.7.orig/CMakeLists.txt	2013-11-12 20:31:27.437095684 +0000
++++ opencv-2.4.7/CMakeLists.txt	2013-11-12 20:40:21.160171499 +0000
+@@ -243,9 +243,9 @@
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(INSTALL_TO_MANGLED_PATHS)
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(WIN32)
+@@ -282,7 +282,7 @@
+     set(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
+   else()
+     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++    set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+   endif()
+   set(OPENCV_INCLUDE_INSTALL_PATH "include")
+ 
+@@ -290,7 +290,7 @@
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff -baur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
+--- opencv-2.4.7.orig/data/CMakeLists.txt	2013-11-12 20:31:27.280430213 +0000
++++ opencv-2.4.7/data/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
+@@ -5,6 +5,6 @@
+   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
+   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT main)
+ elseif(NOT WIN32)
+-  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT main)
++  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT main)
+ endif()
+diff -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt
+--- opencv-2.4.7.orig/modules/java/CMakeLists.txt	2013-11-12 20:31:27.360429532 +0000
++++ opencv-2.4.7/modules/java/CMakeLists.txt	2013-11-12 20:36:41.984985273 +0000
+@@ -279,7 +279,7 @@
+   if(WIN32)
+     set(JAR_INSTALL_DIR java)
+   else(WIN32)
+-    set(JAR_INSTALL_DIR share/OpenCV/java)
++    set(JAR_INSTALL_DIR share/opencv/java)
+   endif(WIN32)
+   install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
+ endif(ANDROID)
+diff -baur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/c/CMakeLists.txt	2013-11-12 20:31:27.433762373 +0000
++++ opencv-2.4.7/samples/c/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
+@@ -54,6 +54,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/c
++          DESTINATION share/opencv/samples/c
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif ()
+diff -baur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt	2013-11-12 20:31:27.417095818 +0000
++++ opencv-2.4.7/samples/cpp/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/cpp
++          DESTINATION share/opencv/samples/cpp
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt	2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt	2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -29,6 +29,6 @@
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB GPU_FILES performance/*.cpp performance/*.h)
+   install(FILES ${GPU_FILES}
+-          DESTINATION share/OpenCV/samples/gpu/performance
++          DESTINATION share/opencv/samples/gpu/performance
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt	2013-11-12 20:31:27.397095952 +0000
++++ opencv-2.4.7/samples/ocl/CMakeLists.txt	2013-11-12 20:39:29.227200043 +0000
+@@ -54,6 +54,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()



More information about the arch-commits mailing list