[arch-commits] Commit in opencv/repos/extra-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Fri Jul 26 10:16:12 UTC 2019


    Date: Friday, July 26, 2019 @ 10:16:11
  Author: arojas
Revision: 358612

archrelease: copy trunk to extra-x86_64

Added:
  opencv/repos/extra-x86_64/PKGBUILD
    (from rev 358611, opencv/trunk/PKGBUILD)
  opencv/repos/extra-x86_64/opencv-includedir.patch
    (from rev 358611, opencv/trunk/opencv-includedir.patch)
Deleted:
  opencv/repos/extra-x86_64/PKGBUILD
  opencv/repos/extra-x86_64/opencv-includedir.patch

-------------------------+
 PKGBUILD                |  183 +++++++++++++++++++++++-----------------------
 opencv-includedir.patch |   18 ++--
 2 files changed, 101 insertions(+), 100 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-26 10:15:53 UTC (rev 358611)
+++ PKGBUILD	2019-07-26 10:16:11 UTC (rev 358612)
@@ -1,91 +0,0 @@
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=opencv
-pkgname=(opencv opencv-samples)
-pkgver=4.1.0
-pkgrel=2
-pkgdesc="Open Source Computer Vision Library"
-arch=(x86_64)
-license=(BSD)
-url="https://opencv.org/"
-depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 vtk glew ant java-environment)
-optdepends=('opencv-samples: samples'
-            'gtk3: for the HighGUI module'
-            'vtk: for the viz module'
-            'hdf5: support for HDF5 format'
-            'opencl-icd-loader: For coding with OpenCL'
-            'python-numpy: Python interface'
-            'java-runtime: Java interface')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
-        "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
-        opencv-includedir.patch)
-sha256sums=('2c75b129da2e2c8728d168b7bf14ceca2da0ebe938557b109bae6742855ede13'
-            'e7d775cc0b87b04308823ca518b11b34cc12907a59af4ccdaf64419c1ba5e682'
-            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
-}
-
-build() {
-  cd build
-  export JAVA_HOME="/usr/lib/jvm/default"
-  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
-  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
-  cmake ../$pkgname-$pkgver \
-    -DWITH_OPENCL=ON \
-    -DWITH_OPENGL=ON \
-    -DWITH_TBB=ON \
-    -DOpenGL_GL_PREFERENCE=GLVND \
-    -DBUILD_WITH_DEBUG_INFO=OFF \
-    -DBUILD_TESTS=OFF \
-    -DBUILD_PERF_TESTS=OFF \
-    -DBUILD_EXAMPLES=ON \
-    -DINSTALL_C_EXAMPLES=ON \
-    -DINSTALL_PYTHON_EXAMPLES=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCPU_BASELINE_DISABLE=SSE3 \
-    -DCPU_BASELINE_REQUIRE=SSE2 \
-    -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
-    -DOPENCV_SKIP_PYTHON_LOADER=ON \
-    -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
-    -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
-    -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
-    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
-    -DOPENCV_GENERATE_PKGCONFIG=ON \
-    -DOPENCV_ENABLE_NONFREE=ON \
-    -DOPENCV_JNI_INSTALL_PATH=lib
-  make
-}
-
-package_opencv() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-
-  # separate samples package
-  cd "$pkgdir"/usr/share
-  mv opencv4/samples "$srcdir"/$pkgname-samples
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=("opencv=$pkgver")
-  unset optdepends
-
-  mkdir -p "$pkgdir"/usr/share/opencv
-  cp -r "$srcdir"/opencv-samples "$pkgdir"/usr/share/opencv/samples
-  # fix permissions
-  chmod 755 "$pkgdir"/usr/share/opencv/samples/*
-
-  # install license file
-  install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-}

Copied: opencv/repos/extra-x86_64/PKGBUILD (from rev 358611, opencv/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-26 10:16:11 UTC (rev 358612)
@@ -0,0 +1,92 @@
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=opencv
+pkgname=(opencv opencv-samples)
+pkgver=4.1.1
+pkgrel=1
+pkgdesc="Open Source Computer Vision Library"
+arch=(x86_64)
+license=(BSD)
+url="https://opencv.org/"
+depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper ffmpeg)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 vtk glew ant java-environment)
+optdepends=('opencv-samples: samples'
+            'gtk3: for the HighGUI module and the Python bindings'
+            'vtk: for the viz module'
+            'hdf5: for the HDF5 module and the Python bindings'
+            'opencl-icd-loader: For coding with OpenCL'
+            'python-numpy: Python bindings'
+            'java-runtime: Java interface')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
+        "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
+        opencv-includedir.patch)
+sha256sums=('d34985c7b4283519c032e3585b30846644f56c81acba35693295ff8930f080aa'
+            '9f85d380758498d800fec26307e389620cde8b1a2e86ab51cddc5200fbe37102'
+            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
+}
+
+build() {
+  cd build
+  export JAVA_HOME="/usr/lib/jvm/default"
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
+  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
+  cmake ../$pkgname-$pkgver \
+    -DWITH_OPENCL=ON \
+    -DWITH_OPENGL=ON \
+    -DWITH_TBB=ON \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+    -DBUILD_WITH_DEBUG_INFO=OFF \
+    -DBUILD_TESTS=OFF \
+    -DBUILD_PERF_TESTS=OFF \
+    -DBUILD_EXAMPLES=ON \
+    -DINSTALL_C_EXAMPLES=ON \
+    -DINSTALL_PYTHON_EXAMPLES=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCPU_BASELINE_DISABLE=SSE3 \
+    -DCPU_BASELINE_REQUIRE=SSE2 \
+    -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+    -DOPENCV_SKIP_PYTHON_LOADER=ON \
+    -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
+    -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
+    -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
+    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
+    -DOPENCV_GENERATE_PKGCONFIG=ON \
+    -DOPENCV_ENABLE_NONFREE=ON \
+    -DOPENCV_JNI_INSTALL_PATH=lib \
+    -DOPENCV_GENERATE_SETUPVARS=OFF
+  make
+}
+
+package_opencv() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  # install license file
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+
+  # separate samples package
+  cd "$pkgdir"/usr/share
+  mv opencv4/samples "$srcdir"/$pkgname-samples
+}
+
+package_opencv-samples() {
+  pkgdesc+=" (samples)"
+  depends=("opencv=$pkgver")
+  unset optdepends
+
+  mkdir -p "$pkgdir"/usr/share/opencv
+  cp -r "$srcdir"/opencv-samples "$pkgdir"/usr/share/opencv/samples
+  # fix permissions
+  chmod 755 "$pkgdir"/usr/share/opencv/samples/*
+
+  # install license file
+  install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}

Deleted: opencv-includedir.patch
===================================================================
--- opencv-includedir.patch	2019-07-26 10:15:53 UTC (rev 358611)
+++ opencv-includedir.patch	2019-07-26 10:16:11 UTC (rev 358612)
@@ -1,9 +0,0 @@
-diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in
---- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in	2018-12-22 07:03:30.000000000 +0000
-+++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in	2019-02-07 15:08:15.016613349 +0000
-@@ -11,4 +10,4 @@
- Version: @OPENCV_VERSION_PLAIN@
- Libs: @OPENCV_PC_LIBS@
- Libs.private: @OPENCV_PC_LIBS_PRIVATE@
--Cflags: -I${includedir_old} -I${includedir_new}
-+Cflags: -I${includedir_new}

Copied: opencv/repos/extra-x86_64/opencv-includedir.patch (from rev 358611, opencv/trunk/opencv-includedir.patch)
===================================================================
--- opencv-includedir.patch	                        (rev 0)
+++ opencv-includedir.patch	2019-07-26 10:16:11 UTC (rev 358612)
@@ -0,0 +1,9 @@
+diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in
+--- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in	2018-12-22 07:03:30.000000000 +0000
++++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in	2019-02-07 15:08:15.016613349 +0000
+@@ -11,4 +10,4 @@
+ Version: @OPENCV_VERSION_PLAIN@
+ Libs: @OPENCV_PC_LIBS@
+ Libs.private: @OPENCV_PC_LIBS_PRIVATE@
+-Cflags: -I${includedir_old} -I${includedir_new}
++Cflags: -I${includedir_new}



More information about the arch-commits mailing list