subject:"\[arch\-commits\] Commit in opencv\/trunk \(PKGBUILD\)"

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-12-22 Thread Antonio Rojas via arch-commits

Date: Tuesday, December 22, 2020 @ 15:04:06
  Author: arojas
Revision: 404839

Update to 4.5.1

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-22 12:08:53 UTC (rev 404838)
+++ PKGBUILD2020-12-22 15:04:06 UTC (rev 404839)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.5.0
-pkgrel=3
+pkgver=4.5.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,8 +20,8 @@
 '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;)
-sha256sums=('168f6e61d8462fb3d5a29ba0d19c0375c25cac753ad01035a359584ccde9'
-'a65f1f0b98b2c720abbf122c502044d11f427a43212d85d8d2402d7a6339edda')
+sha256sums=('5fbc26ee09e148a4d494b225d04217f7c913ca1a4d46115b70cca3565d7bbe05'
+'12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5')
 
 build() {
   export JAVA_HOME="/usr/lib/jvm/default"

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-11-12 Thread Felix Yan via arch-commits

Date: Thursday, November 12, 2020 @ 16:03:05
  Author: felixonmars
Revision: 400592

upgpkg: opencv 4.5.0-3: Python 3.9 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 15:31:23 UTC (rev 400591)
+++ PKGBUILD2020-11-12 16:03:05 UTC (rev 400592)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-11-09 Thread Evangelos Foutras via arch-commits

Date: Monday, November 9, 2020 @ 20:47:21
  Author: foutrelis
Revision: 399941

upgpkg: opencv 4.5.0-2: Python 3.9 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-09 20:20:18 UTC (rev 399940)
+++ PKGBUILD2020-11-09 20:47:21 UTC (rev 399941)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-10-12 Thread Antonio Rojas via arch-commits

Date: Monday, October 12, 2020 @ 16:47:49
  Author: arojas
Revision: 398069

Update to 4.5.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-12 16:15:19 UTC (rev 398068)
+++ PKGBUILD2020-10-12 16:47:49 UTC (rev 398069)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.4.0
-pkgrel=3
+pkgver=4.5.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,8 +20,8 @@
 '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;)
-sha256sums=('7faa0991c74cda52313ee37ef73f3e451332a47e7aa36c2bb2240b69f5002d27'
-'a69772f553b32427e09ffbfd0c8d5e5e47f7dab8b3ffc02851ffd7f912b76840')
+sha256sums=('168f6e61d8462fb3d5a29ba0d19c0375c25cac753ad01035a359584ccde9'
+'a65f1f0b98b2c720abbf122c502044d11f427a43212d85d8d2402d7a6339edda')
 
 build() {
   export JAVA_HOME="/usr/lib/jvm/default"

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-10-10 Thread Antonio Rojas via arch-commits

Date: Saturday, October 10, 2020 @ 12:32:52
  Author: arojas
Revision: 397842

Fix symlinks (FS#67980)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-10 11:33:12 UTC (rev 397841)
+++ PKGBUILD2020-10-10 12:32:52 UTC (rev 397842)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -66,8 +66,8 @@
   mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
 
   # Add java symlinks expected by some binary blobs
-  ln -s "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
-  ln -s "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
+  ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
+  ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
 }
 
 package_opencv-samples() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-10-03 Thread Antonio Rojas via arch-commits

Date: Saturday, October 3, 2020 @ 11:24:34
  Author: arojas
Revision: 397193

Add symlinks expected by some binary blobs (FS#67980)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-03 07:59:12 UTC (rev 397192)
+++ PKGBUILD2020-10-03 11:24:34 UTC (rev 397193)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -64,6 +64,10 @@
 
   # separate samples package
   mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
+
+  # Add java symlinks expected by some binary blobs
+  ln -s "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
+  ln -s "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
 }
 
 package_opencv-samples() {

[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-includedir.patch)

2020-07-25 Thread Antonio Rojas via arch-commits

Date: Saturday, July 25, 2020 @ 06:53:25
  Author: arojas
Revision: 392520

Update to 4.4.0

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/opencv-includedir.patch

-+
 PKGBUILD|   38 --
 opencv-includedir.patch |9 -
 2 files changed, 12 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-25 06:52:57 UTC (rev 392519)
+++ PKGBUILD2020-07-25 06:53:25 UTC (rev 392520)
@@ -3,13 +3,13 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.3.0
-pkgrel=7
+pkgver=4.4.0
+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 
openjpeg2 ffmpeg)
+depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
openjpeg2 ffmpeg)
 makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke 
qt5-base vtk glew ant java-environment)
 optdepends=('opencv-samples: samples'
 'vtk: for the viz module'
@@ -19,27 +19,15 @@
 '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=('36799186756c1e12adde97f0a8d1afc395d5b0f86d8ad9ef951bc33aa732f9b9'
-'acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55'
-'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
+
"opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz;)
+sha256sums=('7faa0991c74cda52313ee37ef73f3e451332a47e7aa36c2bb2240b69f5002d27'
+'a69772f553b32427e09ffbfd0c8d5e5e47f7dab8b3ffc02851ffd7f912b76840')
 
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
-
-  sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # 
Don't use TBB's cmake config, it breaks build
-}
-
 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 \
+  cmake -B build -S $pkgname-$pkgver \
 -DWITH_OPENCL=ON \
 -DWITH_OPENGL=ON \
 -DWITH_TBB=ON \
@@ -65,15 +53,14 @@
 -DOPENCV_JNI_INSTALL_PATH=lib \
 -DOPENCV_GENERATE_SETUPVARS=OFF \
 -DEIGEN_INCLUDE_PATH=/usr/include/eigen3
-  make
+  cmake --build build
 }
 
 package_opencv() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   # install license file
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 $pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 
   # separate samples package
   mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
@@ -84,10 +71,9 @@
   depends=("opencv=$pkgver")
   unset optdepends
 
-  cd build
   mkdir -p "$pkgdir"/usr/share/opencv4
-  mv "$srcdir"/samples "$pkgdir"/usr/share/opencv4
+  mv samples "$pkgdir"/usr/share/opencv4
 
   # install license file
-  install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 opencv-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 }

Deleted: opencv-includedir.patch
===
--- opencv-includedir.patch 2020-07-25 06:52:57 UTC (rev 392519)
+++ opencv-includedir.patch 2020-07-25 06:53:25 UTC (rev 392520)
@@ -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.0 +
-+++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in   2019-02-07 
15:08:15.016613349 +
-@@ -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}

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-05-12 Thread Antonio Rojas via arch-commits

Date: Tuesday, May 12, 2020 @ 08:54:36
  Author: arojas
Revision: 383284

openexr 2.5.1 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-12 08:45:06 UTC (rev 383283)
+++ PKGBUILD2020-05-12 08:54:36 UTC (rev 383284)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-05-09 Thread Antonio Rojas via arch-commits

Date: Saturday, May 9, 2020 @ 15:22:15
  Author: arojas
Revision: 382960

openexr 2.5 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-09 15:15:50 UTC (rev 382959)
+++ PKGBUILD2020-05-09 15:22:15 UTC (rev 382960)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-05-09 Thread Antonio Rojas via arch-commits

Date: Saturday, May 9, 2020 @ 07:36:42
  Author: arojas
Revision: 382850

Use openjpeg for JPEG2000 (FS#64655)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-09 07:08:39 UTC (rev 382849)
+++ PKGBUILD2020-05-09 07:36:42 UTC (rev 382850)
@@ -4,12 +4,12 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=4
+pkgrel=5
 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)
+depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
openjpeg2 ffmpeg)
 makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke 
qt5-base vtk glew ant java-environment)
 optdepends=('opencv-samples: samples'
 'vtk: for the viz module'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-04-15 Thread Antonio Rojas via arch-commits

Date: Wednesday, April 15, 2020 @ 13:03:53
  Author: arojas
Revision: 380366

hdf5 1.12 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-15 12:46:03 UTC (rev 380365)
+++ PKGBUILD2020-04-15 13:03:53 UTC (rev 380366)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-04-15 Thread Antonio Rojas via arch-commits

Date: Wednesday, April 15, 2020 @ 12:44:39
  Author: arojas
Revision: 380364

Enable vulkan support (FS#66264)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-15 10:17:24 UTC (rev 380363)
+++ PKGBUILD2020-04-15 12:44:39 UTC (rev 380364)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -43,6 +43,7 @@
 -DWITH_OPENCL=ON \
 -DWITH_OPENGL=ON \
 -DWITH_TBB=ON \
+-DWITH_VULKAN=ON \
 -DWITH_QT=ON \
 -DBUILD_WITH_DEBUG_INFO=OFF \
 -DBUILD_TESTS=OFF \

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-04-11 Thread Antonio Rojas via arch-commits

Date: Saturday, April 11, 2020 @ 09:30:11
  Author: arojas
Revision: 380014

hdf5 1.12 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-11 09:26:14 UTC (rev 380013)
+++ PKGBUILD2020-04-11 09:30:11 UTC (rev 380014)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-04-04 Thread Antonio Rojas via arch-commits

Date: Saturday, April 4, 2020 @ 09:30:41
  Author: arojas
Revision: 379498

Update to 4.3.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-04 09:21:58 UTC (rev 379497)
+++ PKGBUILD2020-04-04 09:30:41 UTC (rev 379498)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.2.0
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,12 +20,10 @@
 '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
-
opencv-install-samples_utils.patch::"https://github.com/opencv/opencv/commit/981e63d8.patch;)
-sha256sums=('55bd939079d141a50fca74bde5b61b339dd0f0ece6320ec76859aaff03c90d9f'
-'8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'
-'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10'
-'c370f234931d46cd01234d48a01af02642d7e90a0486278fa7845d3bac1c514a')
+opencv-includedir.patch)
+sha256sums=('36799186756c1e12adde97f0a8d1afc395d5b0f86d8ad9ef951bc33aa732f9b9'
+'acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55'
+'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {
   mkdir -p build
@@ -32,7 +30,6 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
-  patch -p1 -i ../opencv-install-samples_utils.patch # Install all CMake files 
required to build samples
 
   sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # 
Don't use TBB's cmake config, it breaks build
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2020-02-28 Thread Antonio Rojas via arch-commits

Date: Friday, February 28, 2020 @ 11:17:07
  Author: arojas
Revision: 376382

Install all CMake files required to build samples (FS#63742)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-28 10:40:52 UTC (rev 376381)
+++ PKGBUILD2020-02-28 11:17:07 UTC (rev 376382)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,10 +20,12 @@
 '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)
+opencv-includedir.patch
+
opencv-install-samples_utils.patch::"https://github.com/opencv/opencv/commit/981e63d8.patch;)
 sha256sums=('55bd939079d141a50fca74bde5b61b339dd0f0ece6320ec76859aaff03c90d9f'
 '8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'
-'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
+'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10'
+'c370f234931d46cd01234d48a01af02642d7e90a0486278fa7845d3bac1c514a')
 
 prepare() {
   mkdir -p build
@@ -30,6 +32,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
+  patch -p1 -i ../opencv-install-samples_utils.patch # Install all CMake files 
required to build samples
 
   sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # 
Don't use TBB's cmake config, it breaks build
 }
@@ -75,8 +78,7 @@
   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
+  mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
 }
 
 package_opencv-samples() {
@@ -84,10 +86,9 @@
   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/*
+  cd build
+  mkdir -p "$pkgdir"/usr/share/opencv4
+  mv "$srcdir"/samples "$pkgdir"/usr/share/opencv4
 
   # install license file
   install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-12-20 Thread Antonio Rojas via arch-commits

Date: Saturday, December 21, 2019 @ 00:25:29
  Author: arojas
Revision: 372007

Update to 4.2.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-20 19:04:18 UTC (rev 372006)
+++ PKGBUILD2019-12-21 00:25:29 UTC (rev 372007)
@@ -3,14 +3,14 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.1.2
-pkgrel=4
+pkgver=4.2.0
+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 
qt5-base vtk glew ant java-environment)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke 
qt5-base vtk glew ant java-environment xorgproto)
 optdepends=('opencv-samples: samples'
 'vtk: for the viz module'
 'qt5-base: for the HighGUI module and the Python bindings'
@@ -21,8 +21,8 @@
 
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=('546d7d19388f2eea709a1951c7bfd56943241e41649473278950f4cbef656661'
-'0f6c3d30baa39e3e7611afb481ee86dea45dafb182cac87d570c95dccd83eb8b'
+sha256sums=('55bd939079d141a50fca74bde5b61b339dd0f0ece6320ec76859aaff03c90d9f'
+'8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'
 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-11-03 Thread Felix Yan via arch-commits

Date: Monday, November 4, 2019 @ 00:05:17
  Author: felixonmars
Revision: 366647

Python 3.8 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-03 23:09:51 UTC (rev 366646)
+++ PKGBUILD2019-11-04 00:05:17 UTC (rev 366647)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-10-26 Thread Felix Yan via arch-commits

Date: Saturday, October 26, 2019 @ 18:32:44
  Author: felixonmars
Revision: 365892

Python 3.8 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-26 17:19:40 UTC (rev 365891)
+++ PKGBUILD2019-10-26 18:32:44 UTC (rev 365892)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-10-19 Thread Antonio Rojas via arch-commits

Date: Saturday, October 19, 2019 @ 11:18:44
  Author: arojas
Revision: 365212

Fix build with intel-tbb 2019.9

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-19 10:26:27 UTC (rev 365211)
+++ PKGBUILD2019-10-19 11:18:44 UTC (rev 365212)
@@ -30,6 +30,8 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
+
+  sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # 
Don't use TBB's cmake config, it breaks build
 }
 
 build() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-10-18 Thread Antonio Rojas via arch-commits

Date: Friday, October 18, 2019 @ 23:37:16
  Author: arojas
Revision: 365180

Not needed with openexr 2.4.0-3

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |3 ---
 1 file changed, 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 23:36:34 UTC (rev 365179)
+++ PKGBUILD2019-10-18 23:37:16 UTC (rev 365180)
@@ -30,9 +30,6 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
-# Fix build with openexr 2.4
-  sed -e 's|Half|Half-2_4|' -e 's|Iex|Iex-2_4|' -e 's|Imath|Imath-2_4|' -e 
's|IlmImf|IlmImf-2_4|' -e 's|IlmThread|IlmThread-2_4|' \
--i cmake/OpenCVFindOpenEXR.cmake
 }
 
 build() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-10-18 Thread Antonio Rojas via arch-commits

Date: Friday, October 18, 2019 @ 21:29:38
  Author: arojas
Revision: 365168

openexr 2.4 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 19:25:30 UTC (rev 365167)
+++ PKGBUILD2019-10-18 21:29:38 UTC (rev 365168)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -30,6 +30,9 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
+# Fix build with openexr 2.4
+  sed -e 's|Half|Half-2_4|' -e 's|Iex|Iex-2_4|' -e 's|Imath|Imath-2_4|' -e 
's|IlmImf|IlmImf-2_4|' -e 's|IlmThread|IlmThread-2_4|' \
+-i cmake/OpenCVFindOpenEXR.cmake
 }
 
 build() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-10-10 Thread Antonio Rojas via arch-commits

Date: Thursday, October 10, 2019 @ 15:10:05
  Author: arojas
Revision: 364575

Update to 4.1.2, build highgui module with Qt (which brings opengl support)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-10 15:09:53 UTC (rev 364574)
+++ PKGBUILD2019-10-10 15:10:05 UTC (rev 364575)
@@ -3,7 +3,7 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
@@ -10,10 +10,10 @@
 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)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke 
qt5-base vtk glew ant java-environment)
 optdepends=('opencv-samples: samples'
-'gtk3: for the HighGUI module and the Python bindings'
 'vtk: for the viz module'
+'qt5-base: for the HighGUI module and the Python bindings'
 'hdf5: for the HDF5 module and the Python bindings'
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python bindings'
@@ -21,8 +21,8 @@
 
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'
+sha256sums=('546d7d19388f2eea709a1951c7bfd56943241e41649473278950f4cbef656661'
+'0f6c3d30baa39e3e7611afb481ee86dea45dafb182cac87d570c95dccd83eb8b'
 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {
@@ -41,7 +41,7 @@
 -DWITH_OPENCL=ON \
 -DWITH_OPENGL=ON \
 -DWITH_TBB=ON \
--DOpenGL_GL_PREFERENCE=GLVND \
+-DWITH_QT=ON \
 -DBUILD_WITH_DEBUG_INFO=OFF \
 -DBUILD_TESTS=OFF \
 -DBUILD_PERF_TESTS=OFF \
@@ -49,7 +49,6 @@
 -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" \

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-07-26 Thread Antonio Rojas via arch-commits

Date: Friday, July 26, 2019 @ 17:20:14
  Author: arojas
Revision: 358631

Worksaround broken eigen include dir detection

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-26 17:16:11 UTC (rev 358630)
+++ PKGBUILD2019-07-26 17:20:14 UTC (rev 358631)
@@ -61,7 +61,8 @@
 -DOPENCV_GENERATE_PKGCONFIG=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
 -DOPENCV_JNI_INSTALL_PATH=lib \
--DOPENCV_GENERATE_SETUPVARS=OFF
+-DOPENCV_GENERATE_SETUPVARS=OFF \
+-DEIGEN_INCLUDE_PATH=/usr/include/eigen3
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-07-26 Thread Antonio Rojas via arch-commits

Date: Friday, July 26, 2019 @ 10:15:53
  Author: arojas
Revision: 358611

Update to 4.1.1

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-26 09:37:06 UTC (rev 358610)
+++ PKGBUILD2019-07-26 10:15:53 UTC (rev 358611)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.1.0
-pkgrel=2
+pkgver=4.1.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -21,8 +21,8 @@
 
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'
+sha256sums=('d34985c7b4283519c032e3585b30846644f56c81acba35693295ff8930f080aa'
+'9f85d380758498d800fec26307e389620cde8b1a2e86ab51cddc5200fbe37102'
 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {
@@ -60,7 +60,8 @@
 -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
 -DOPENCV_GENERATE_PKGCONFIG=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
--DOPENCV_JNI_INSTALL_PATH=lib
+-DOPENCV_JNI_INSTALL_PATH=lib \
+-DOPENCV_GENERATE_SETUPVARS=OFF
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-06-11 Thread Antonio Rojas via arch-commits

Date: Tuesday, June 11, 2019 @ 18:22:33
  Author: arojas
Revision: 355796

Add optdepends for Python bindings

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-11 18:22:25 UTC (rev 355795)
+++ PKGBUILD2019-06-11 18:22:33 UTC (rev 355796)
@@ -12,11 +12,11 @@
 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'
+'gtk3: for the HighGUI module and the Python bindings'
 'vtk: for the viz module'
-'hdf5: support for HDF5 format'
+'hdf5: for the HDF5 module and the Python bindings'
 'opencl-icd-loader: For coding with OpenCL'
-'python-numpy: Python interface'
+'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;

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-05-22 Thread Antonio Rojas via arch-commits

Date: Wednesday, May 22, 2019 @ 19:03:03
  Author: arojas
Revision: 353859

libdc1394 2.2.6 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-22 18:48:11 UTC (rev 353858)
+++ PKGBUILD2019-05-22 19:03:03 UTC (rev 353859)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-04-08 Thread Antonio Rojas via arch-commits

Date: Monday, April 8, 2019 @ 09:39:54
  Author: arojas
Revision: 350318

Update to 4.1.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-08 09:28:16 UTC (rev 350317)
+++ PKGBUILD2019-04-08 09:39:54 UTC (rev 350318)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.0.1
-pkgrel=6
+pkgver=4.1.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -21,8 +21,8 @@
 
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=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
-'0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237'
+sha256sums=('2c75b129da2e2c8728d168b7bf14ceca2da0ebe938557b109bae6742855ede13'
+'e7d775cc0b87b04308823ca518b11b34cc12907a59af4ccdaf64419c1ba5e682'
 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-03-16 Thread Antonio Rojas via arch-commits

Date: Saturday, March 16, 2019 @ 23:07:26
  Author: arojas
Revision: 348533

hdf5 1.10.5 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 22:18:34 UTC (rev 348532)
+++ PKGBUILD2019-03-16 23:07:26 UTC (rev 348533)
@@ -4,13 +4,13 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=5
+pkgrel=6
 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 double-conversion)
+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'

[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-includedir.patch)

2019-02-07 Thread Antonio Rojas via arch-commits

Date: Thursday, February 7, 2019 @ 16:42:50
  Author: arojas
Revision: 345609

Fix include dirs in pkgconfig file

Added:
  opencv/trunk/opencv-includedir.patch
Modified:
  opencv/trunk/PKGBUILD

-+
 PKGBUILD|   11 ---
 opencv-includedir.patch |9 +
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-07 15:49:18 UTC (rev 345608)
+++ PKGBUILD2019-02-07 16:42:50 UTC (rev 345609)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -19,12 +19,17 @@
 '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_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz;
+opencv-includedir.patch)
 sha256sums=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
-'0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237')
+'0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237'
+'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in 
pkgconfig file
 }
 
 build() {

Added: opencv-includedir.patch
===
--- opencv-includedir.patch (rev 0)
+++ opencv-includedir.patch 2019-02-07 16:42:50 UTC (rev 345609)
@@ -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.0 +
 opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in   2019-02-07 
15:08:15.016613349 +
+@@ -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}

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-02-04 Thread Antonio Rojas via arch-commits

Date: Monday, February 4, 2019 @ 21:34:04
  Author: arojas
Revision: 345268

Rebuild against vtk 8.2 (FS#61626)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-04 19:59:32 UTC (rev 345267)
+++ PKGBUILD2019-02-04 21:34:04 UTC (rev 345268)
@@ -4,13 +4,13 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=3
+pkgrel=4
 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)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 
vtk glew ant java-environment double-conversion)
 optdepends=('opencv-samples: samples'
 'gtk3: for the HighGUI module'
 'vtk: for the viz module'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-01-06 Thread Antonio Rojas via arch-commits

Date: Sunday, January 6, 2019 @ 13:07:29
  Author: arojas
Revision: 343034

Add Java support (FS#41452)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-06 12:18:08 UTC (rev 343033)
+++ PKGBUILD2019-01-06 13:07:29 UTC (rev 343034)
@@ -4,19 +4,20 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
 url="http://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)
+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')
+'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;)
 sha256sums=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
@@ -28,6 +29,7 @@
 
 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 \
@@ -52,7 +54,8 @@
 -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
 -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
 -DOPENCV_GENERATE_PKGCONFIG=ON \
--DOPENCV_ENABLE_NONFREE=ON
+-DOPENCV_ENABLE_NONFREE=ON \
+-DOPENCV_JNI_INSTALL_PATH=lib
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2019-01-05 Thread Antonio Rojas via arch-commits

Date: Saturday, January 5, 2019 @ 10:57:48
  Author: arojas
Revision: 342996

Enable nonfree algorithms (FS#61196)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-05 08:50:30 UTC (rev 342995)
+++ PKGBUILD2019-01-05 10:57:48 UTC (rev 342996)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -51,7 +51,8 @@
 
-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_GENERATE_PKGCONFIG=ON \
+-DOPENCV_ENABLE_NONFREE=ON
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-legacy-headers.patch)

2018-12-24 Thread Antonio Rojas via arch-commits

Date: Monday, December 24, 2018 @ 12:58:34
  Author: arojas
Revision: 342710

Update to 4.0.1

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/opencv-legacy-headers.patch

-+
 PKGBUILD|   14 --
 opencv-legacy-headers.patch |   12 
 2 files changed, 4 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-24 08:25:19 UTC (rev 342709)
+++ PKGBUILD2018-12-24 12:58:34 UTC (rev 342710)
@@ -3,8 +3,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.0.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -19,8 +19,8 @@
 'python-numpy: Python 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;)
-sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
-'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
+sha256sums=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
+'0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237')
 
 prepare() {
   mkdir -p build
@@ -65,12 +65,6 @@
   # separate samples package
   cd "$pkgdir"/usr/share
   mv opencv4/samples "$srcdir"/$pkgname-samples
-
-  # install missing headers https://github.com/opencv/opencv/issues/13201
-  for _module in imgcodecs videoio photo; do
-cp -r 
"$srcdir"/$pkgname-$pkgver/modules/$_module/include/opencv2/$_module/legacy \
-  "$pkgdir"/usr/include/opencv4/opencv2/$_module
-  done
 }
 
 package_opencv-samples() {

Deleted: opencv-legacy-headers.patch
===
--- opencv-legacy-headers.patch 2018-12-24 08:25:19 UTC (rev 342709)
+++ opencv-legacy-headers.patch 2018-12-24 12:58:34 UTC (rev 342710)
@@ -1,12 +0,0 @@
-diff --git a/modules/imgcodecs/CMakeLists.txt 
b/modules/imgcodecs/CMakeLists.txt
-index d771224d4..dc9587927 100644
 a/modules/imgcodecs/CMakeLists.txt
-+++ b/modules/imgcodecs/CMakeLists.txt
-@@ -102,6 +102,7 @@ file(GLOB imgcodecs_ext_hdrs
-  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp"
-  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"
-  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h"
-+ "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*/*.h"
-  )
- 
- if(IOS)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-11-21 Thread Antonio Rojas via arch-commits

Date: Wednesday, November 21, 2018 @ 08:28:20
  Author: arojas
Revision: 340182

Fix python binding (FS#60855), install more missing headers

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   33 ++---
 1 file changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-21 03:16:17 UTC (rev 340181)
+++ PKGBUILD2018-11-21 08:28:20 UTC (rev 340182)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -18,22 +18,18 @@
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 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-legacy-headers.patch)
+
"opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz;)
 sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
-'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763'
-'7c31ab3855b047d35b1d953431dea4145fa2a408451d8a23e19d020a9afda4ad')
+'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../opencv-legacy-headers.patch # Install legacy headers
 }
 
 build() {
   cd build
   # 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 \
@@ -50,17 +46,16 @@
 -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 \
--DPYTHON2_EXECUTABLE=/usr/bin/python2
+-DOPENCV_GENERATE_PKGCONFIG=ON
   make
 }
 
 package_opencv() {
-  options=(staticlibs)
-
   cd build
   make DESTDIR="$pkgdir" install
 
@@ -67,15 +62,15 @@
   # install license file
   install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 
-  # install python bindings
-  cd python_loader
-  python setup.py install --root="$pkgdir"
-  rm -r "$pkgdir"/usr/python
-
+  # separate samples package
   cd "$pkgdir"/usr/share
+  mv opencv4/samples "$srcdir"/$pkgname-samples
 
-  # separate samples package
-  mv opencv4/samples "$srcdir/$pkgname-samples"
+  # install missing headers https://github.com/opencv/opencv/issues/13201
+  for _module in imgcodecs videoio photo; do
+cp -r 
"$srcdir"/$pkgname-$pkgver/modules/$_module/include/opencv2/$_module/legacy \
+  "$pkgdir"/usr/include/opencv4/opencv2/$_module
+  done
 }
 
 package_opencv-samples() {

[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-legacy-headers.patch)

2018-11-18 Thread Antonio Rojas via arch-commits

Date: Sunday, November 18, 2018 @ 16:54:09
  Author: arojas
Revision: 340099

Fix missing legacy headers

Added:
  opencv/trunk/opencv-legacy-headers.patch
Modified:
  opencv/trunk/PKGBUILD

-+
 PKGBUILD|   11 ---
 opencv-legacy-headers.patch |   12 
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-18 16:53:43 UTC (rev 340098)
+++ PKGBUILD2018-11-18 16:54:09 UTC (rev 340099)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -18,12 +18,17 @@
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 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_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz;
+opencv-legacy-headers.patch)
 sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
-'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
+'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763'
+'7c31ab3855b047d35b1d953431dea4145fa2a408451d8a23e19d020a9afda4ad')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../opencv-legacy-headers.patch # Install legacy headers
 }
 
 build() {

Added: opencv-legacy-headers.patch
===
--- opencv-legacy-headers.patch (rev 0)
+++ opencv-legacy-headers.patch 2018-11-18 16:54:09 UTC (rev 340099)
@@ -0,0 +1,12 @@
+diff --git a/modules/imgcodecs/CMakeLists.txt 
b/modules/imgcodecs/CMakeLists.txt
+index d771224d4..dc9587927 100644
+--- a/modules/imgcodecs/CMakeLists.txt
 b/modules/imgcodecs/CMakeLists.txt
+@@ -102,6 +102,7 @@ file(GLOB imgcodecs_ext_hdrs
+  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp"
+  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"
+  "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h"
++ "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*/*.h"
+  )
+ 
+ if(IOS)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-11-18 Thread Antonio Rojas via arch-commits

Date: Sunday, November 18, 2018 @ 14:29:36
  Author: arojas
Revision: 340096

Install pkgconfig file for now, many projects still need it

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-18 14:04:50 UTC (rev 340095)
+++ PKGBUILD2018-11-18 14:29:36 UTC (rev 340096)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -47,7 +47,9 @@
 -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
 
-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"
+-DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
+-DOPENCV_GENERATE_PKGCONFIG=ON \
+-DPYTHON2_EXECUTABLE=/usr/bin/python2
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-11-18 Thread Antonio Rojas via arch-commits

Date: Sunday, November 18, 2018 @ 14:04:27
  Author: arojas
Revision: 340094

Update to 4.0.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-18 13:33:04 UTC (rev 340093)
+++ PKGBUILD2018-11-18 14:04:27 UTC (rev 340094)
@@ -3,7 +3,7 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=3.4.4
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
@@ -19,8 +19,8 @@
 'python-numpy: Python 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;)
-sha256sums=('b5755384cbadf67f55838c6cfd9ae1aad0ebad2c7cfe4c1174417c80d2ed15a9'
-'765446d994713363554978d1da447fef77a2cdf9e38742f0a98b13b92652626d')
+sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
+'4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
 
 prepare() {
   mkdir -p build
@@ -68,8 +68,7 @@
   cd "$pkgdir"/usr/share
 
   # separate samples package
-  mv OpenCV/samples "$srcdir/$pkgname-samples"
-  mv OpenCV $pkgname # otherwise folder naming is inconsistent
+  mv opencv4/samples "$srcdir/$pkgname-samples"
 }
 
 package_opencv-samples() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-11-17 Thread Antonio Rojas via arch-commits

Date: Saturday, November 17, 2018 @ 22:42:18
  Author: arojas
Revision: 340073

Update to 3.4.4

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-17 20:40:07 UTC (rev 340072)
+++ PKGBUILD2018-11-17 22:42:18 UTC (rev 340073)
@@ -3,25 +3,24 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=3.4.3
-pkgrel=5
+pkgver=3.4.4
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
 url="http://opencv.org/;
 depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
jasper ffmpeg)
-makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3 vtk 
glew)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 
vtk glew)
 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 3 interface'
-'python2-numpy: Python 2 interface')
+'python-numpy: Python 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;)
-sha256sums=('37c7d8c3b9807902ad11b9181bbde61dcb3898a78a563130494752f46fe8cc5f'
-'6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636')
+sha256sums=('b5755384cbadf67f55838c6cfd9ae1aad0ebad2c7cfe4c1174417c80d2ed15a9'
+'765446d994713363554978d1da447fef77a2cdf9e38742f0a98b13b92652626d')
 
 prepare() {
   mkdir -p build
@@ -61,6 +60,11 @@
   # install license file
   install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 
+  # install python bindings
+  cd python_loader
+  python setup.py install --root="$pkgdir"
+  rm -r "$pkgdir"/usr/python
+
   cd "$pkgdir"/usr/share
 
   # separate samples package

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-10-23 Thread Antonio Rojas via arch-commits

Date: Tuesday, October 23, 2018 @ 16:20:49
  Author: arojas
Revision: 337189

HDF5 1.10.4 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-23 15:05:08 UTC (rev 337188)
+++ PKGBUILD2018-10-23 16:20:49 UTC (rev 337189)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-10-19 Thread Antonio Rojas via arch-commits

Date: Friday, October 19, 2018 @ 08:46:31
  Author: arojas
Revision: 336874

Enable ffmpeg support (may fix FS#60459)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-19 08:43:59 UTC (rev 336873)
+++ PKGBUILD2018-10-19 08:46:31 UTC (rev 336874)
@@ -4,12 +4,12 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
 url="http://opencv.org/;
-depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
jasper)
+depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
jasper ffmpeg)
 makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3 vtk 
glew)
 optdepends=('opencv-samples: samples'
 'gtk3: for the HighGUI module'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-09-29 Thread Antonio Rojas via arch-commits

Date: Saturday, September 29, 2018 @ 13:10:50
  Author: arojas
Revision: 335548

Enable viz module (FS#41923)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-29 10:45:06 UTC (rev 335547)
+++ PKGBUILD2018-09-29 13:10:50 UTC (rev 335548)
@@ -4,15 +4,16 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
 url="http://opencv.org/;
 depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
jasper)
-makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3)
+makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3 vtk 
glew)
 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 3 interface'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-08-31 Thread Antonio Rojas via arch-commits

Date: Friday, August 31, 2018 @ 10:07:14
  Author: arojas
Revision: 333160

hdf5 1.10.3 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-31 08:53:29 UTC (rev 333159)
+++ PKGBUILD2018-08-31 10:07:14 UTC (rev 333160)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-08-29 Thread Antonio Rojas via arch-commits

Date: Wednesday, August 29, 2018 @ 14:04:20
  Author: arojas
Revision: 333085

Update to 3.4.3

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-29 13:47:49 UTC (rev 333084)
+++ PKGBUILD2018-08-29 14:04:20 UTC (rev 333085)
@@ -4,8 +4,8 @@
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
-pkgver=3.4.2
-pkgrel=4
+pkgver=3.4.3
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,8 +20,8 @@
 'python2-numpy: Python 2 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;)
-sha256sums=('9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa'
-'45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d')
+sha256sums=('37c7d8c3b9807902ad11b9181bbde61dcb3898a78a563130494752f46fe8cc5f'
+'6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636')
 
 prepare() {
   mkdir -p build

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-08-23 Thread Antonio Rojas via arch-commits

Date: Thursday, August 23, 2018 @ 17:52:56
  Author: arojas
Revision: 332865

hdf5 1.10.3 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-23 14:01:35 UTC (rev 332864)
+++ PKGBUILD2018-08-23 17:52:56 UTC (rev 332865)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-08-19 Thread Antonio Rojas via arch-commits

Date: Sunday, August 19, 2018 @ 10:05:26
  Author: arojas
Revision: 332647

ilmbase/openexr 2.3 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-19 10:04:20 UTC (rev 332646)
+++ PKGBUILD2018-08-19 10:05:26 UTC (rev 332647)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -63,13 +63,9 @@
 
   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
+  # separate samples package
+  mv OpenCV/samples "$srcdir/$pkgname-samples"
+  mv OpenCV $pkgname # otherwise folder naming is inconsistent
 }
 
 package_opencv-samples() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-07-18 Thread Evangelos Foutras via arch-commits

Date: Wednesday, July 18, 2018 @ 06:31:32
  Author: foutrelis
Revision: 328955

Python 3.7 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-18 06:23:40 UTC (rev 328954)
+++ PKGBUILD2018-07-18 06:31:32 UTC (rev 328955)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-07-04 Thread Antonio Rojas via arch-commits

Date: Wednesday, July 4, 2018 @ 16:17:51
  Author: arojas
Revision: 327970

Update to 3.4.2, switch to GTK3 and gstreamer

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   79 -
 1 file changed, 37 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-04 14:30:56 UTC (rev 327969)
+++ PKGBUILD2018-07-04 16:17:51 UTC (rev 327970)
@@ -3,17 +3,17 @@
 # Contributor: Tobias Powalowski 
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-samples')
-pkgver=3.4.1
-pkgrel=3
+pkgname=(opencv opencv-samples)
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
-arch=('x86_64')
-license=('BSD')
+arch=(x86_64)
+license=(BSD)
 url="http://opencv.org/;
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 
'libgphoto2' 'jasper')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke' 'gtkglext')
-optdepends=('opencv-samples'
-'gtkglext: for the HighGUI module'
+depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 
jasper)
+makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3)
+optdepends=('opencv-samples: samples'
+'gtk3: for the HighGUI module'
 'hdf5: support for HDF5 format'
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 3 interface'
@@ -20,50 +20,48 @@
 'python2-numpy: Python 2 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;)
-sha256sums=('24bda432eaace9e992322dcc3d30144cefa5314c2424d4aa02e5fe3fa9dd17bd'
-'298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e')
+sha256sums=('9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa'
+'45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d')
 
-_cmakeopts=('-D WITH_OPENCL=ON'
-'-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 BUILD_EXAMPLES=ON'
-'-D INSTALL_C_EXAMPLES=ON'
-'-D INSTALL_PYTHON_EXAMPLES=ON'
-'-D CMAKE_INSTALL_PREFIX=/usr'
-'-D CMAKE_INSTALL_LIBDIR=lib'
-'-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2'
-)
+prepare() {
+  mkdir -p build
+}
 
 build() {
-  mkdir -p build
-
   cd build
   # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to 
specify them manually
-  cmake ${_cmakeopts[@]} \
+  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" \
 
-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" \
-../$pkgname-$pkgver
+-DLAPACK_LAPACKE_H="/usr/include/lapacke.h"
   make
 }
 
 package_opencv() {
-  options=('staticlibs')
+  options=(staticlibs)
 
   cd build
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
-"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 
-  cd "$pkgdir/usr/share"
+  cd "$pkgdir"/usr/share
 
   # separate samples package; also be -R friendly
   if [[ -d OpenCV/samples ]]; then
@@ -76,17 +74,14 @@
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=("opencv=$pkgver") # sample codes change with lib/API
+  depends=("opencv=$pkgver")
   unset optdepends
 
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+  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" \
-"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
 }
-
-# vim:set ts=2 sw=2 et:

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-04-23 Thread Antonio Rojas via arch-commits

Date: Monday, April 23, 2018 @ 17:45:45
  Author: arojas
Revision: 322855

ffmpeg 4.0 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 17:43:05 UTC (rev 322854)
+++ PKGBUILD2018-04-23 17:45:45 UTC (rev 322855)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-03-13 Thread Antonio Rojas via arch-commits

Date: Tuesday, March 13, 2018 @ 09:28:32
  Author: arojas
Revision: 318787

Add missing jasper dependency (FS#57818)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-13 09:09:21 UTC (rev 318786)
+++ PKGBUILD2018-03-13 09:28:32 UTC (rev 318787)
@@ -5,12 +5,12 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')
 url="http://opencv.org/;
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 
'libgphoto2')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 
'libgphoto2' 'jasper')
 makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke' 'gtkglext')
 optdepends=('opencv-samples'
 'gtkglext: for the HighGUI module'
@@ -34,13 +34,9 @@
 '-D BUILD_EXAMPLES=ON'
 '-D INSTALL_C_EXAMPLES=ON'
 '-D INSTALL_PYTHON_EXAMPLES=ON'
-'-D CMAKE_BUILD_TYPE=Release'
 '-D CMAKE_INSTALL_PREFIX=/usr'
 '-D CMAKE_INSTALL_LIBDIR=lib'
-'-D CMAKE_SKIP_RPATH=ON'
 '-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2'
-#'-D WITH_IPP=ON'
-#'-D INSTALL_CREATE_DISTRIB=ON'
 )
 
 build() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-03-01 Thread Antonio Rojas via arch-commits

Date: Thursday, March 1, 2018 @ 08:13:04
  Author: arojas
Revision: 317670

Update to 3.4.1

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-01 07:41:29 UTC (rev 317669)
+++ PKGBUILD2018-03-01 08:13:04 UTC (rev 317670)
@@ -4,8 +4,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=3.4.0
-pkgrel=3
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')
@@ -20,8 +20,8 @@
 'python2-numpy: Python 2 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;)
-sha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7'
-'699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
+sha256sums=('24bda432eaace9e992322dcc3d30144cefa5314c2424d4aa02e5fe3fa9dd17bd'
+'298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-02-26 Thread Antonio Rojas via arch-commits

Date: Monday, February 26, 2018 @ 09:39:42
  Author: arojas
Revision: 317550

ilmbase/openexr 2.2.1 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-26 09:32:09 UTC (rev 317549)
+++ PKGBUILD2018-02-26 09:39:42 UTC (rev 317550)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2018-01-30 Thread Antonio Rojas via arch-commits

Date: Tuesday, January 30, 2018 @ 19:05:04
  Author: arojas
Revision: 315628

Make gtkglext optional

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-30 18:48:08 UTC (rev 315627)
+++ PKGBUILD2018-01-30 19:05:04 UTC (rev 315628)
@@ -10,9 +10,10 @@
 arch=('x86_64')
 license=('BSD')
 url="http://opencv.org/;
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 
'lapack' 'libgphoto2')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 
'libgphoto2')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke' 'gtkglext')
 optdepends=('opencv-samples'
+'gtkglext: for the HighGUI module'
 'hdf5: support for HDF5 format'
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 3 interface'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-12-24 Thread Antonio Rojas via arch-commits

Date: Sunday, December 24, 2017 @ 11:42:53
  Author: arojas
Revision: 313583

Fix libdir

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-24 11:25:28 UTC (rev 313582)
+++ PKGBUILD2017-12-24 11:42:53 UTC (rev 313583)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')
@@ -35,6 +35,7 @@
 '-D INSTALL_PYTHON_EXAMPLES=ON'
 '-D CMAKE_BUILD_TYPE=Release'
 '-D CMAKE_INSTALL_PREFIX=/usr'
+'-D CMAKE_INSTALL_LIBDIR=lib'
 '-D CMAKE_SKIP_RPATH=ON'
 '-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2'
 #'-D WITH_IPP=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-12-24 Thread Antonio Rojas via arch-commits

Date: Sunday, December 24, 2017 @ 11:25:04
  Author: arojas
Revision: 313581

Update to 3.4.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-24 10:24:56 UTC (rev 313580)
+++ PKGBUILD2017-12-24 11:25:04 UTC (rev 313581)
@@ -4,13 +4,13 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=3.3.1
-pkgrel=3
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')
 url="http://opencv.org/;
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 
'lapack')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 
'lapack' 'libgphoto2')
 makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke')
 optdepends=('opencv-samples'
 'hdf5: support for HDF5 format'
@@ -19,8 +19,8 @@
 'python2-numpy: Python 2 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;)
-sha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932'
-'6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
+sha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7'
+'699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-12-05 Thread Antonio Rojas via arch-commits

Date: Tuesday, December 5, 2017 @ 21:51:14
  Author: arojas
Revision: 311664

Oops

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-05 21:49:44 UTC (rev 311663)
+++ PKGBUILD2017-12-05 21:51:14 UTC (rev 311664)
@@ -52,6 +52,7 @@
 -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
 -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
 ../$pkgname-$pkgver
+  make
 }
 
 package_opencv() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-12-05 Thread Antonio Rojas via arch-commits

Date: Tuesday, December 5, 2017 @ 19:20:03
  Author: arojas
Revision: 311646

Enable LAPACK support (FS#56351)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-05 18:44:10 UTC (rev 311645)
+++ PKGBUILD2017-12-05 19:20:03 UTC (rev 311646)
@@ -5,13 +5,13 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('x86_64')
 license=('BSD')
 url="http://opencv.org/;
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 
'lapack')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 
'lapacke')
 optdepends=('opencv-samples'
 'hdf5: support for HDF5 format'
 'opencl-icd-loader: For coding with OpenCL'
@@ -36,23 +36,22 @@
 '-D CMAKE_BUILD_TYPE=Release'
 '-D CMAKE_INSTALL_PREFIX=/usr'
 '-D CMAKE_SKIP_RPATH=ON'
+'-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2'
 #'-D WITH_IPP=ON'
 #'-D INSTALL_CREATE_DISTRIB=ON'
 )
 
-# SSE only available from Pentium 3 onwards (i686 is way older)
-[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
-[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D 
CPU_BASELINE_REQUIRE=SSE2')
-
 build() {
   mkdir -p build
 
   cd build
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to 
specify them manually
   cmake ${_cmakeopts[@]} \
 -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+
-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" \
 ../$pkgname-$pkgver
-
-  make
 }
 
 package_opencv() {
@@ -59,7 +58,6 @@
   options=('staticlibs')
 
   cd build
-
   make DESTDIR="$pkgdir" install
 
   # install license file

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-11-04 Thread Antonio Rojas

Date: Saturday, November 4, 2017 @ 21:54:52
  Author: arojas
Revision: 308914

Disable SSE3 instructions (FS#56233)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-04 21:04:31 UTC (rev 308913)
+++ PKGBUILD2017-11-04 21:54:52 UTC (rev 308914)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -41,10 +41,8 @@
 )
 
 # 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')
+[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D 
CPU_BASELINE_REQUIRE=SSE2')
 
 build() {
   mkdir -p build

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-10-26 Thread Antonio Rojas

Date: Thursday, October 26, 2017 @ 17:18:41
  Author: arojas
Revision: 308508

Update to 3.3.1

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-26 15:46:35 UTC (rev 308507)
+++ PKGBUILD2017-10-26 17:18:41 UTC (rev 308508)
@@ -4,8 +4,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -19,8 +19,8 @@
 'python2-numpy: Python 2 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;)
-sha256sums=('3546c3837f88177c898e4172942da7a3ca6c4e8e98a33d0cbccb2b499167c5ba'
-'e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444')
+sha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932'
+'6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-08-27 Thread Antonio Rojas

Date: Sunday, August 27, 2017 @ 13:36:37
  Author: arojas
Revision: 304259

Update source URL

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-27 13:35:39 UTC (rev 304258)
+++ PKGBUILD2017-08-27 13:36:37 UTC (rev 304259)
@@ -17,8 +17,8 @@
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 3 interface'
 'python2-numpy: Python 2 interface')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;
-
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz;)
+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;)
 sha256sums=('3546c3837f88177c898e4172942da7a3ca6c4e8e98a33d0cbccb2b499167c5ba'
 'e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-08-27 Thread Antonio Rojas

Date: Sunday, August 27, 2017 @ 13:35:00
  Author: arojas
Revision: 304257

Fix permssions in contrib samples (FS#49993)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-27 09:53:30 UTC (rev 304256)
+++ PKGBUILD2017-08-27 13:35:00 UTC (rev 304257)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -19,8 +19,8 @@
 'python2-numpy: Python 2 interface')
 
source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz;)
-md5sums=('cc586ebe960a7cdd87100e89088abc06'
- '7878ff39d3488b335861831419d30c64')
+sha256sums=('3546c3837f88177c898e4172942da7a3ca6c4e8e98a33d0cbccb2b499167c5ba'
+'e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
@@ -86,6 +86,8 @@
 
   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" \

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-08-19 Thread Antonio Rojas

Date: Saturday, August 19, 2017 @ 22:00:16
  Author: arojas
Revision: 302915

Update to 3.3.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-19 21:44:19 UTC (rev 302914)
+++ PKGBUILD2017-08-19 22:00:16 UTC (rev 302915)
@@ -4,8 +4,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=3.2.0
-pkgrel=5
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -19,8 +19,8 @@
 'python2-numpy: Python 2 interface')
 
source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz;)
-md5sums=('bfc6a261eb069b709bcfe7e363ef5899'
- 'd7d50c70c31df3b31310f548f31fd2a2')
+md5sums=('cc586ebe960a7cdd87100e89088abc06'
+ '7878ff39d3488b335861831419d30c64')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
@@ -47,11 +47,12 @@
'-D ENABLE_SSE3=OFF')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  mkdir -p build
 
+  cd build
   cmake ${_cmakeopts[@]} \
 -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
-.
+../$pkgname-$pkgver
 
   make
 }
@@ -59,7 +60,7 @@
 package_opencv() {
   options=('staticlibs')
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd build
 
   make DESTDIR="$pkgdir" install

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-06-17 Thread Antonio Rojas

Date: Saturday, June 17, 2017 @ 14:44:20
  Author: arojas
Revision: 298936

hdf5 1.10.1 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 12:53:01 UTC (rev 298935)
+++ PKGBUILD2017-06-17 14:44:20 UTC (rev 298936)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-06-07 Thread Antonio Rojas

Date: Wednesday, June 7, 2017 @ 19:07:09
  Author: arojas
Revision: 298139

Add hdf5 make+optdepend, not pulled by ffmpeg anymore (FS#54347)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-07 18:30:30 UTC (rev 298138)
+++ PKGBUILD2017-06-07 19:07:09 UTC (rev 298139)
@@ -5,15 +5,15 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/;
 depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
 optdepends=('opencv-samples'
-'eigen'
+'hdf5: support for HDF5 format'
 'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 3 interface'
 'python2-numpy: Python 2 interface')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-04-27 Thread Evangelos Foutras

Date: Thursday, April 27, 2017 @ 06:46:55
  Author: foutrelis
Revision: 294889

libwebp 0.6.0 / poppler 0.54.0 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-27 06:23:17 UTC (rev 294888)
+++ PKGBUILD2017-04-27 06:46:55 UTC (rev 294889)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2017-04-16 Thread Jelle van der Waa

Date: Sunday, April 16, 2017 @ 18:28:28
  Author: jelle
Revision: 293035

FS#53680 - [opencv] Rebuild needed because of ffmpeg

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-16 10:03:04 UTC (rev 293034)
+++ PKGBUILD2017-04-16 18:28:28 UTC (rev 293035)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-12-25 Thread Bartłomiej Piotrowski

Date: Sunday, December 25, 2016 @ 17:41:59
  Author: bpiotrowski
Revision: 284748

Python 3.6 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-25 17:39:17 UTC (rev 284747)
+++ PKGBUILD2016-12-25 17:41:59 UTC (rev 284748)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-12-05 Thread Laurent Carlier

Date: Monday, December 5, 2016 @ 09:59:13
  Author: lcarlier
Revision: 282836

upgpkg: opencv 3.1.0-6

moved from libcl to opencl-icd-loader

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-05 07:22:00 UTC (rev 282835)
+++ PKGBUILD2016-12-05 09:59:13 UTC (rev 282836)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -14,7 +14,7 @@
 makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
 optdepends=('opencv-samples'
 'eigen'
-'libcl: For coding with OpenCL'
+'opencl-icd-loader: For coding with OpenCL'
 'python-numpy: Python 3 interface'
 'python2-numpy: Python 2 interface')
 
source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-11-22 Thread Levente Polyak

Date: Tuesday, November 22, 2016 @ 13:15:24
  Author: anthraxx
Revision: 281834

upgpkg: opencv 3.1.0-5 (jasper rebuild)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-22 13:01:52 UTC (rev 281833)
+++ PKGBUILD2016-11-22 13:15:24 UTC (rev 281834)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-11-11 Thread Antonio Rojas

Date: Friday, November 11, 2016 @ 16:11:31
  Author: arojas
Revision: 280548

jasper 1.900.24 rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-11 15:21:55 UTC (rev 280547)
+++ PKGBUILD2016-11-11 16:11:31 UTC (rev 280548)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -19,9 +19,10 @@
 'python2-numpy: Python 2 interface')
 
source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz;
-'5852.patch')
+
opencv-gcc6.patch::"https://github.com/mshabunin/opencv/commit/a0fdc91a.patch; 
'5852.patch')
 md5sums=('6082ee2124d4066581a7386972bfd52a'
  'a822839ad3ab79ff837c16785ea9dd10'
+ '4dacea7866d28014939a652f268cc7c1'
  '5bd9cd736b171c15cedee3a32a0c47ff')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
@@ -51,6 +52,8 @@
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 -i "$srcdir/5852.patch"
+# Fix build with GCC 6
+  patch -p1 -i "$srcdir"/opencv-gcc6.patch
 }
 
 build() {

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-03-08 Thread Bartłomiej Piotrowski

Date: Wednesday, March 9, 2016 @ 08:42:55
  Author: bpiotrowski
Revision: 261236

upgpkg: opencv 3.1.0-2

bring back contrib modules

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-08 23:05:16 UTC (rev 261235)
+++ PKGBUILD2016-03-09 07:42:55 UTC (rev 261236)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -17,9 +17,10 @@
 'libcl: For coding with OpenCL'
 'python-numpy: Python 3 interface'
 'python2-numpy: Python 2 interface')
-#source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
-source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;)
-md5sums=('6082ee2124d4066581a7386972bfd52a')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip;
+
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz;)
+md5sums=('6082ee2124d4066581a7386972bfd52a'
+ 'a822839ad3ab79ff837c16785ea9dd10')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
@@ -46,7 +47,9 @@
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  cmake ${_cmakeopts[@]} .
+  cmake ${_cmakeopts[@]} \
+-DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+.
 
   make
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-03-08 Thread Bartłomiej Piotrowski

Date: Tuesday, March 8, 2016 @ 18:42:32
  Author: bpiotrowski
Revision: 261218

upgpkg: opencv 3.1.0-1

new upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-08 11:52:25 UTC (rev 261217)
+++ PKGBUILD2016-03-08 17:42:32 UTC (rev 261218)
@@ -4,7 +4,7 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.12.3
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
@@ -11,15 +11,15 @@
 license=('BSD')
 url="http://opencv.org/;
 depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
 optdepends=('opencv-samples'
-'eigen2'
+'eigen'
 'libcl: For coding with OpenCL'
-'python2-numpy: Python 2.x interface')
+'python-numpy: Python 3 interface'
+'python2-numpy: Python 2 interface')
 #source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
-source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 opencv-ffmpeg3.patch)
-md5sums=('eaede6500e9c2d56683196b0576db1f7'
- 'c752f3e83ebb021171fdd04aa7fb2e5a')
+source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;)
+md5sums=('6082ee2124d4066581a7386972bfd52a')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
@@ -34,7 +34,8 @@
 '-D INSTALL_PYTHON_EXAMPLES=ON'
 '-D CMAKE_BUILD_TYPE=Release'
 '-D CMAKE_INSTALL_PREFIX=/usr'
-'-D CMAKE_SKIP_RPATH=ON')
+'-D CMAKE_SKIP_RPATH=ON'
+'-D BUILD_NEW_PYTHON_SUPPORT=ON')
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 [[ "$CARCH" = 'i686' ]] && \
@@ -42,15 +43,6 @@
'-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 $pkgname-$pkgver
-# Fix build with ffmpeg 3.0 (Debian)
-  patch -p1 -i ../opencv-ffmpeg3.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2016-02-17 Thread Antonio Rojas

Date: Wednesday, February 17, 2016 @ 11:16:39
  Author: arojas
Revision: 259894

Update to 2.4.12.3

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 09:20:12 UTC (rev 259893)
+++ PKGBUILD2016-02-17 10:16:39 UTC (rev 259894)
@@ -4,8 +4,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.12.2
-pkgrel=3
+pkgver=2.4.12.3
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,7 +18,7 @@
 'python2-numpy: Python 2.x interface')
 #source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
 
source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 opencv-ffmpeg3.patch)
-md5sums=('5f7cde7f0bccd90542805ea20687fc8d'
+md5sums=('eaede6500e9c2d56683196b0576db1f7'
  'c752f3e83ebb021171fdd04aa7fb2e5a')
 
 _cmakeopts=('-D WITH_OPENCL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-ffmpeg3.patch)

2016-02-17 Thread Antonio Rojas

Date: Wednesday, February 17, 2016 @ 10:10:34
  Author: arojas
Revision: 259890

ffmpeg 3.0 rebuild

Added:
  opencv/trunk/opencv-ffmpeg3.patch
Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++
 opencv-ffmpeg3.patch |  217 +
 2 files changed, 227 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 08:00:15 UTC (rev 259889)
+++ PKGBUILD2016-02-17 09:10:34 UTC (rev 259890)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -17,8 +17,9 @@
 'libcl: For coding with OpenCL'
 'python2-numpy: Python 2.x interface')
 #source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
-source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;)
-md5sums=('5f7cde7f0bccd90542805ea20687fc8d')
+source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;
 opencv-ffmpeg3.patch)
+md5sums=('5f7cde7f0bccd90542805ea20687fc8d'
+ 'c752f3e83ebb021171fdd04aa7fb2e5a')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
@@ -44,6 +45,12 @@
 # all x64 CPUs support SSE2 but not SSE3
 [[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
 
+prepare() {
+  cd $pkgname-$pkgver
+# Fix build with ffmpeg 3.0 (Debian)
+  patch -p1 -i ../opencv-ffmpeg3.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: opencv-ffmpeg3.patch
===
--- opencv-ffmpeg3.patch(rev 0)
+++ opencv-ffmpeg3.patch2016-02-17 09:10:34 UTC (rev 259890)
@@ -0,0 +1,217 @@
+--- opencv-2.4.9.1+dfsg.orig/modules/highgui/src/cap_ffmpeg_impl.hpp
 opencv-2.4.9.1+dfsg/modules/highgui/src/cap_ffmpeg_impl.hpp
+@@ -136,9 +136,9 @@ extern "C" {
+ #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, 
__FILE__, __LINE__)
+ #endif
+ 
+-/* PIX_FMT_RGBA32 macro changed in newer ffmpeg versions */
+-#ifndef PIX_FMT_RGBA32
+-#define PIX_FMT_RGBA32 PIX_FMT_RGB32
++/* AV_PIX_FMT_RGBA32 macro changed in newer ffmpeg versions */
++#ifndef AV_PIX_FMT_RGBA32
++#define AV_PIX_FMT_RGBA32 AV_PIX_FMT_RGB32
+ #endif
+ 
+ #define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
+@@ -304,7 +304,7 @@ {
+ // FFmpeg and Libav added avcodec_free_frame in different versions.
+ #if LIBAVCODEC_BUILD >= (LIBAVCODEC_VERSION_MICRO >= 100 \
+ ? CALC_FFMPEG_VERSION(54, 59, 100) : CALC_FFMPEG_VERSION(54, 28, 0))
+-avcodec_free_frame();
++av_frame_free();
+ #else
+ av_free(picture);
+ #endif
+@@ -572,13 +572,13 @@ bool CvCapture_FFMPEG::open( const char*
+ 
+ video_stream = i;
+ video_st = ic->streams[i];
+-picture = avcodec_alloc_frame();
++picture = av_frame_alloc();
+ 
+ rgb_picture.data[0] = (uint8_t*)malloc(
+-avpicture_get_size( PIX_FMT_BGR24,
++avpicture_get_size( AV_PIX_FMT_BGR24,
+ enc->width, enc->height ));
+ avpicture_fill( (AVPicture*)_picture, rgb_picture.data[0],
+-PIX_FMT_BGR24, enc->width, enc->height );
++AV_PIX_FMT_BGR24, enc->width, enc->height );
+ 
+ frame.width = enc->width;
+ frame.height = enc->height;
+@@ -670,7 +670,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int
+ if( !video_st || !picture->data[0] )
+ return false;
+ 
+-avpicture_fill((AVPicture*)_picture, rgb_picture.data[0], 
PIX_FMT_RGB24,
++avpicture_fill((AVPicture*)_picture, rgb_picture.data[0], 
AV_PIX_FMT_RGB24,
+video_st->codec->width, video_st->codec->height);
+ 
+ if( img_convert_ctx == NULL ||
+@@ -688,7 +688,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int
+ video_st->codec->width, video_st->codec->height,
+ video_st->codec->pix_fmt,
+ video_st->codec->width, video_st->codec->height,
+-PIX_FMT_BGR24,
++AV_PIX_FMT_BGR24,
+ SWS_BICUBIC,
+ NULL, NULL, NULL
+ );
+@@ -1001,10 +1001,10 @@ static AVFrame * icv_alloc_picture_FFMPE
+ uint8_t * picture_buf;
+ int size;
+ 
+-picture = avcodec_alloc_frame();
++picture = av_frame_alloc();
+ if (!picture)
+ return NULL;
+-size = avpicture_get_size( (PixelFormat) pix_fmt, width, height);
++size = avpicture_get_size( (AVPixelFormat) pix_fmt, width, height);
+ if(alloc){
+ picture_buf = (uint8_t *) malloc(size);
+ if (!picture_buf)
+@@ -1013,7 +1013,7 @@ static AVFrame * icv_alloc_picture_FFMPE
+ return NULL;
+

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2015-12-06 Thread Antonio Rojas

Date: Monday, December 7, 2015 @ 03:57:20
  Author: arojas
Revision: 253171

C++11 ABI rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 02:54:46 UTC (rev 253170)
+++ PKGBUILD2015-12-07 02:57:20 UTC (rev 253171)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2015-10-03 Thread Ray Rashif

Date: Saturday, October 3, 2015 @ 23:19:58
  Author: schiv
Revision: 248312

upgpkg: opencv 2.4.12.2-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-03 20:50:29 UTC (rev 248311)
+++ PKGBUILD2015-10-03 21:19:58 UTC (rev 248312)
@@ -4,7 +4,7 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.11
+pkgver=2.4.12.2
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
@@ -16,8 +16,9 @@
 'eigen2'
 'libcl: For coding with OpenCL'
 'python2-numpy: Python 2.x interface')
-source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
-md5sums=('32f498451bff1817a60e1aabc2939575')
+#source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
+source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip;)
+md5sums=('5f7cde7f0bccd90542805ea20687fc8d')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2015-08-06 Thread Jan de Groot

Date: Thursday, August 6, 2015 @ 14:09:31
  Author: jgc
Revision: 243081

Remove unused patches from PKGBUILD (FS#45912)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-06 11:06:28 UTC (rev 243080)
+++ PKGBUILD2015-08-06 12:09:31 UTC (rev 243081)
@@ -16,14 +16,8 @@
 'eigen2'
 'libcl: For coding with OpenCL'
 'python2-numpy: Python 2.x interface')
-source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
-'pkgconfig.patch'
-'fsh.patch'
-'x86_asmfix.patch')
-md5sums=('32f498451bff1817a60e1aabc2939575'
- 'c7cea48ed7d4f729ebdb9673bac41bd3'
- 'c597598d142dd34d0eb4af7d6e9779d8'
- 'b937d3589a62666f17f6dc93e0109717')
+source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;)
+md5sums=('32f498451bff1817a60e1aabc2939575')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'

[arch-commits] Commit in opencv/trunk (PKGBUILD fsh.patch)

2015-08-01 Thread Ray Rashif

Date: Saturday, August 1, 2015 @ 12:41:34
  Author: schiv
Revision: 242915

upgpkg: opencv 2.4.11-1

long delayed update to last 2.x release

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/fsh.patch

---+
 PKGBUILD  |   43 ++
 fsh.patch |  136 
 2 files changed, 15 insertions(+), 164 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-01 08:43:36 UTC (rev 242914)
+++ PKGBUILD2015-08-01 10:41:34 UTC (rev 242915)
@@ -4,27 +4,29 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-_contrib=opencv_contrib
-pkgver=3.0.0
+pkgver=2.4.11
 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')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
 'eigen2'
 'libcl: For coding with OpenCL'
-'python2-numpy: Python 2.x interface'
-'python-numpy: Python 3.x interface')
+'python2-numpy: Python 2.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')
+'pkgconfig.patch'
+'fsh.patch'
+'x86_asmfix.patch')
+md5sums=('32f498451bff1817a60e1aabc2939575'
+ 'c7cea48ed7d4f729ebdb9673bac41bd3'
+ 'c597598d142dd34d0eb4af7d6e9779d8'
+ 'b937d3589a62666f17f6dc93e0109717')
 
-_cmakeopts=('-D WITH_OPENGL=ON'
+_cmakeopts=('-D WITH_OPENCL=ON'
+'-D WITH_OPENGL=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
 '-D WITH_GSTREAMER=OFF'
@@ -31,10 +33,9 @@
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
 '-D BUILD_PERF_TESTS=OFF'
-'-D INSTALL_TESTS=ON'
+'-D BUILD_EXAMPLES=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')
@@ -48,25 +49,11 @@
 # 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
 }
 

Deleted: fsh.patch
===
--- fsh.patch   2015-08-01 08:43:36 UTC (rev 242914)
+++ fsh.patch   2015-08-01 10:41:34 UTC (rev 242915)
@@ -1,136 +0,0 @@
-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 +
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake2013-11-12 
20:31:54.923577113 +
-@@ -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 
+
-+++ opencv-2.4.7/cmake/OpenCVModule.cmake  2013-11-12 20:35:37.805415871 
+
-@@ -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 +
-+++ opencv-2.4.7/CMakeLists.txt2013-11-12 20:40:21.160171499

[arch-commits] Commit in opencv/trunk (PKGBUILD pkgconfig.patch x86_asmfix.patch)

2015-06-28 Thread Ray Rashif

Date: Sunday, June 28, 2015 @ 22:56:50
  Author: schiv
Revision: 241385

upgpkg: opencv 3.0.0-1

upstream major release; lots of changes

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/pkgconfig.patch
  opencv/trunk/x86_asmfix.patch

--+
 PKGBUILD |   66 ++---
 pkgconfig.patch  |   35 
 x86_asmfix.patch |   46 
 3 files changed, 28 insertions(+), 119 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-28 19:23:32 UTC (rev 241384)
+++ PKGBUILD2015-06-28 20:56:50 UTC (rev 241385)
@@ -4,29 +4,27 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.10
-pkgrel=3
+_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')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+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')
+'python2-numpy: Python 2.x interface'
+'python-numpy: Python 3.x interface')
 source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
-'pkgconfig.patch'
-'fsh.patch'
-'x86_asmfix.patch')
-md5sums=('ec63952d3a3dff965d5fdde765926821'
- 'c7cea48ed7d4f729ebdb9673bac41bd3'
- 'c597598d142dd34d0eb4af7d6e9779d8'
- 'b937d3589a62666f17f6dc93e0109717')
+
$_contrib-$pkgver::git+https://github.com/Itseez/$_contrib.git#tag=$pkgver;)
+md5sums=('09004c275d8092cbdf5b61675cecd399'
+ 'SKIP')
 
-_cmakeopts=('-D WITH_OPENCL=ON'
-'-D WITH_OPENGL=ON'
+_cmakeopts=('-D WITH_OPENGL=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
 '-D WITH_GSTREAMER=OFF'
@@ -33,9 +31,10 @@
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
 '-D BUILD_PERF_TESTS=OFF'
-'-D BUILD_EXAMPLES=ON'
+'-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')
@@ -49,34 +48,25 @@
 # all x64 CPUs support SSE2 but not SSE3
 [[ $CARCH = 'x86_64' ]]  _cmakeopts+=('-D ENABLE_SSE3=OFF')
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
+#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
+#}
 
-  msg2 Applying backported fix for x86 ASM breakage
-  # see https://github.com/Itseez/opencv/pull/3331
-  patch -Np1 -i $srcdir/x86_asmfix.patch
-
-  msg2 Fixing broken pkg-config (downstream)
-  # see https://bugs.archlinux.org/task/32430
-  # and http://code.opencv.org/issues/1925
-  patch -Np1 -i $srcdir/pkgconfig.patch
-
-  # 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
 }
 

Deleted: pkgconfig.patch
===
--- pkgconfig.patch 2015-06-28 19:23:32 UTC (rev 241384)
+++ pkgconfig.patch 2015-06-28 20:56:50 UTC (rev 241385)
@@ -1,35 +0,0 @@
-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 +
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake2013-11-12 
20:41:48.936262732 +
-@@ -10,7 +10,7 @@
- # 
---
- set(prefix  ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2015-05-08 Thread Tobias Powalowski

Date: Friday, May 8, 2015 @ 19:39:22
  Author: tpowa
Revision: 238708

upgpkg: opencv 2.4.10-3

rebuild against openxer/ilmbase 2.2.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 17:38:05 UTC (rev 238707)
+++ PKGBUILD2015-05-08 17:39:22 UTC (rev 238708)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.10
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-11-11 Thread Ray Rashif

Date: Tuesday, November 11, 2014 @ 20:52:47
  Author: schiv
Revision: 226073

upgpkg: opencv 2.4.10-2

Undo vtk feature as it cant

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-11 19:00:21 UTC (rev 226072)
+++ PKGBUILD2014-11-11 19:52:47 UTC (rev 226073)
@@ -5,17 +5,16 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
 url=http://opencv.org/;
 depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2' 'vtk')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
 'eigen2'
 'libcl: For coding with OpenCL'
-'vtk: 3D visualization'
 'python2-numpy: Python 2.x interface')
 source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
 'pkgconfig.patch'
@@ -28,7 +27,6 @@
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
-'-D WITH_VTK=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
 '-D WITH_GSTREAMER=OFF'

[arch-commits] Commit in opencv/trunk (PKGBUILD x86_asmfix.patch)

2014-10-31 Thread Ray Rashif

Date: Friday, October 31, 2014 @ 15:14:35
  Author: schiv
Revision: 225517

upgpkg: opencv 2.4.10-1

upstream release; also implement FS#41923

Added:
  opencv/trunk/x86_asmfix.patch
Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 x86_asmfix.patch |   46 ++
 2 files changed, 60 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-31 13:57:06 UTC (rev 225516)
+++ PKGBUILD2014-10-31 14:14:35 UTC (rev 225517)
@@ -4,27 +4,31 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.9
-pkgrel=5
+pkgver=2.4.10
+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')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2' 'vtk')
 optdepends=('opencv-samples'
 'eigen2'
 'libcl: For coding with OpenCL'
+'vtk: 3D visualization'
 'python2-numpy: Python 2.x interface')
 source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
 'pkgconfig.patch'
-'fsh.patch')
-md5sums=('7f958389e71c77abdf5efe1da988b80c'
+'fsh.patch'
+'x86_asmfix.patch')
+md5sums=('ec63952d3a3dff965d5fdde765926821'
  'c7cea48ed7d4f729ebdb9673bac41bd3'
- 'c597598d142dd34d0eb4af7d6e9779d8')
+ 'c597598d142dd34d0eb4af7d6e9779d8'
+ 'b937d3589a62666f17f6dc93e0109717')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
+'-D WITH_VTK=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
 '-D WITH_GSTREAMER=OFF'
@@ -50,6 +54,10 @@
 prepare() {
   cd $srcdir/$pkgname-$pkgver
 
+  msg2 Applying backported fix for x86 ASM breakage
+  # see https://github.com/Itseez/opencv/pull/3331
+  patch -Np1 -i $srcdir/x86_asmfix.patch
+
   msg2 Fixing broken pkg-config (downstream)
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925

Added: x86_asmfix.patch
===
--- x86_asmfix.patch(rev 0)
+++ x86_asmfix.patch2014-10-31 14:14:35 UTC (rev 225517)
@@ -0,0 +1,46 @@
+From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001
+From: Samuel Martin s.marti...@gmail.com
+Date: Sun, 12 Oct 2014 10:17:23 +0200
+Subject: [PATCH] core: fix x86 PIC code compilation
+
+This bug was triggered by Buildroot autobuilders [1,2], causing this
+kind of failures [3,4]:
+
+  [ 14%] Building CXX object 
modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
+  
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:
 In function '(static initializers for 
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
+  
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10:
 error: inconsistent operand constraints in an 'asm'
+  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] 
Error 1
+
+[1] http://buildroot.org/
+[2] http://autobuild.buildroot.org/
+[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
+[4] 
http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
+
+Signed-off-by: Samuel Martin s.marti...@gmail.com
+---
+ modules/core/src/system.cpp | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 5a970d5..e9ffdc7 100644
+--- a/modules/core/src/system.cpp
 b/modules/core/src/system.cpp
+@@ -267,14 +267,17 @@ struct HWFeatures
+  : cc
+ );
+ #else
++// We need to preserve ebx since we are compiling PIC code.
++// This means we cannot use =b for the 2nd output register.
+ asm volatile
+ (
+  pushl %%ebx\n\t
+  movl $7,%%eax\n\t
+  movl $0,%%ecx\n\t
+  cpuid\n\t
++ movl %%ebx,%1\n\t
+  popl %%ebx\n\t
+- : =a(cpuid_data[0]), =b(cpuid_data[1]), =c(cpuid_data[2]), 
=d(cpuid_data[3])
++ : =a(cpuid_data[0]), =r(cpuid_data[1]), =c(cpuid_data[2]), 
=d(cpuid_data[3])
+  :
+  : cc
+ );

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-09-22 Thread Bartłomiej Piotrowski

Date: Monday, September 22, 2014 @ 08:40:23
  Author: bpiotrowski
Revision: 222563

upgpkg: opencv 2.4.9-5

rebuild against ffmpeg 2.4

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-22 06:35:00 UTC (rev 222562)
+++ PKGBUILD2014-09-22 06:40:23 UTC (rev 222563)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.9
-pkgrel=4
+pkgrel=5
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-09-17 Thread Jan de Groot

Date: Wednesday, September 17, 2014 @ 16:49:01
  Author: jgc
Revision: 221850

upgpkg: opencv 2.4.9-4

Build without gstreamer support, fixes crashes in GStreamer 1.0 applications 
using opencv (digikam)

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-17 14:38:01 UTC (rev 221849)
+++ PKGBUILD2014-09-17 14:49:01 UTC (rev 221850)
@@ -5,13 +5,12 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.9
-pkgrel=3
+pkgrel=4
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
 url=http://opencv.org/;
-depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
- 'xine-lib' 'libdc1394' 'gtkglext')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
 makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
 'eigen2'
@@ -28,6 +27,7 @@
 '-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'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-08-05 Thread Ray Rashif

Date: Tuesday, August 5, 2014 @ 12:02:22
  Author: schiv
Revision: 219322

upgpkg: opencv 2.4.9-2

FS#41452 add java support

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-05 09:53:28 UTC (rev 219321)
+++ PKGBUILD2014-08-05 10:02:22 UTC (rev 219322)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.9
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -12,7 +12,7 @@
 url=http://opencv.org/;
 depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
  'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2' 'apache-ant')
 optdepends=('opencv-samples'
 'eigen2'
 'libcl: For coding with OpenCL'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-08-05 Thread Ray Rashif

Date: Tuesday, August 5, 2014 @ 17:46:13
  Author: schiv
Revision: 219331

upgpkg: opencv 2.4.9-3

FS#41452 revert update due to regression

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-05 12:59:27 UTC (rev 219330)
+++ PKGBUILD2014-08-05 15:46:13 UTC (rev 219331)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.9
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -12,7 +12,7 @@
 url=http://opencv.org/;
 depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
  'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2' 'apache-ant')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
 'eigen2'
 'libcl: For coding with OpenCL'

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-06-24 Thread Ray Rashif

Date: Tuesday, June 24, 2014 @ 22:06:11
  Author: schiv
Revision: 215427

upgpkg: opencv 2.4.9-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-24 19:21:02 UTC (rev 215426)
+++ PKGBUILD2014-06-24 20:06:11 UTC (rev 215427)
@@ -4,9 +4,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -21,7 +20,7 @@
 source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('50cc1433b3654074206f5b3dbfd49848'
+md5sums=('7f958389e71c77abdf5efe1da988b80c'
  'c7cea48ed7d4f729ebdb9673bac41bd3'
  'c597598d142dd34d0eb4af7d6e9779d8')
 
@@ -51,15 +50,16 @@
 prepare() {
   cd $srcdir/$pkgname-$pkgver
 
-  # hack-fix pkg-config mess
+  msg2 Fixing broken pkg-config (downstream)
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925
   patch -Np1 -i $srcdir/pkgconfig.patch
 
-  # hack-fix folder naming inconsistency that they won't fix
+  # 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
+  #patch -Np1 -i $srcdir/fsh.patch
 
   # no longer including docs, see https://bugs.archlinux.org/task/34185
   # python2 compatibility for generating (html) docs
@@ -82,16 +82,17 @@
   make DESTDIR=$pkgdir install
 
   # install license file
-  install -Dm644 $srcdir/$pkgname-$pkgver/doc/license.txt \
+  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 $pkgname/samples ]]; then
-mv $pkgname/samples $srcdir/opencv-samples
-  elif [[ -d $_realname ]]; then
-warn Directory naming issue; samples package may not be built!
+  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
 }
 
@@ -104,7 +105,7 @@
   cp -r $srcdir/opencv-samples $pkgdir/usr/share/opencv/samples
 
   # install license file
-  install -Dm644 $srcdir/opencv-$pkgver/doc/license.txt \
+  install -Dm644 $srcdir/opencv-$pkgver/LICENSE \
 $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-05-15 Thread Tobias Powalowski

Date: Thursday, May 15, 2014 @ 15:09:01
  Author: tpowa
Revision: 212809

upgpkg: opencv 2.4.8-2

rebuild against latest openexr

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 12:50:32 UTC (rev 212808)
+++ PKGBUILD2014-05-15 13:09:01 UTC (rev 212809)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2014-01-02 Thread Ray Rashif

Date: Thursday, January 2, 2014 @ 23:35:01
  Author: schiv
Revision: 203052

upgpkg: opencv 2.4.8-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-02 20:19:55 UTC (rev 203051)
+++ PKGBUILD2014-01-02 22:35:01 UTC (rev 203052)
@@ -5,8 +5,8 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,10 +18,10 @@
 'eigen2'
 'libcl: For coding with OpenCL'
 'python2-numpy: Python 2.x interface')
-source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
+source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('33a12a8bba6e6dc32c97298c99b083b2'
+md5sums=('50cc1433b3654074206f5b3dbfd49848'
  'c7cea48ed7d4f729ebdb9673bac41bd3'
  'c597598d142dd34d0eb4af7d6e9779d8')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-11-14 Thread Ray Rashif

Date: Thursday, November 14, 2013 @ 22:29:37
  Author: schiv
Revision: 199536

upgpkg: opencv 2.4.7-2

reintroduce static libs; closes FS#37754
needed for new opencv_ts requirement
opencl headers are now in-tree
libcl is now truly optional (dynamically supported)
fix dir detection as previous conditional could return 1

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-14 19:03:14 UTC (rev 199535)
+++ PKGBUILD2013-11-14 21:29:37 UTC (rev 199536)
@@ -4,18 +4,19 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
+_realname=OpenCV
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
 url=http://opencv.org/;
-depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl'
- 'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa'
- 'opencl-headers' 'eigen2')
+depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
+ 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
 'eigen2'
+'libcl: For coding with OpenCL'
 'python2-numpy: Python 2.x interface')
 
source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
 'pkgconfig.patch'
@@ -74,6 +75,8 @@
 }
 
 package_opencv() {
+  options=('staticlibs')
+
   cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
@@ -85,14 +88,17 @@
   cd $pkgdir/usr/share
 
   # separate samples package; also be -R friendly
-  [[ -d $pkgname/samples ]]  mv $pkgname/samples $srcdir/opencv-samples
+  if [[ -d $pkgname/samples ]]; then
+mv $pkgname/samples $srcdir/opencv-samples
+  elif [[ -d $_realname ]]; then
+warn Directory naming issue; samples package may not be built!
+  fi
 }
 
 package_opencv-samples() {
   pkgdesc+= (samples)
-  depends=('bash')
+  depends=(opencv=$pkgver) # sample codes change with lib/API
   unset optdepends
-  unset options
 
   mkdir -p $pkgdir/usr/share/opencv
   cp -r $srcdir/opencv-samples $pkgdir/usr/share/opencv/samples

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-09-25 Thread Ray Rashif

Date: Wednesday, September 25, 2013 @ 22:17:25
  Author: schiv
Revision: 195159

upgpkg: opencv 2.4.6.1-3

ffmpeg rebuild needed again; FS#36981

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-25 20:15:57 UTC (rev 195158)
+++ PKGBUILD2013-09-25 20:17:25 UTC (rev 195159)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-07-22 Thread Bartłomiej Piotrowski

Date: Monday, July 22, 2013 @ 20:08:35
  Author: bpiotrowski
Revision: 191266

upgpkg: opencv 2.4.6.1-2

- rebuild against ffmpeg 2.0

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-22 17:45:13 UTC (rev 191265)
+++ PKGBUILD2013-07-22 18:08:35 UTC (rev 191266)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD cldetect.patch)

2013-07-12 Thread Ray Rashif

Date: Friday, July 12, 2013 @ 15:36:55
  Author: schiv
Revision: 189984

upgpkg: opencv 2.4.6.1-1

upstream release
fixes upstream bug FS#36092
added workaround for FS#36076

Added:
  opencv/trunk/cldetect.patch
Modified:
  opencv/trunk/PKGBUILD

+
 PKGBUILD   |   16 +++-
 cldetect.patch |   23 +++
 2 files changed, 34 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-12 13:36:13 UTC (rev 189983)
+++ PKGBUILD2013-07-12 13:36:55 UTC (rev 189984)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.6
+pkgver=2.4.6.1
 pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
@@ -20,16 +20,17 @@
 'python2-numpy: Python 2.x interface')
 
source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
 'pkgconfig.patch'
-'fsh.patch')
-md5sums=('c5e8758a419b4f258611b17fc83aafaf'
+'fsh.patch'
+'cldetect.patch')
+md5sums=('d756bfa460891697571d5c90050e1cfe'
  'cb916260b5ec594fe7a0cc2e54fc569f'
- '35256e3ccace373feba8131d1540a0de')
+ '35256e3ccace373feba8131d1540a0de'
+ '0dd6572405adc2387ded4c95be0f189c')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
 '-D WITH_OPENGL=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
-'-D BUILD_PACKAGE=OFF'
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
 '-D BUILD_PERF_TESTS=OFF'
@@ -52,6 +53,11 @@
 prepare() {
   cd $srcdir/$pkgname-$pkgver
 
+  # fix missing opencl module
+  # see https://bugs.archlinux.org/task/36076
+  # and http://code.opencv.org/issues/3140
+  patch -Np1 -i $srcdir/cldetect.patch
+
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925

Added: cldetect.patch
===
--- cldetect.patch  (rev 0)
+++ cldetect.patch  2013-07-12 13:36:55 UTC (rev 189984)
@@ -0,0 +1,23 @@
+diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 
opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
+--- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake   2013-07-11 
18:57:27.363199736 +
 opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake2013-07-11 
19:04:00.577069207 +
+@@ -17,8 +17,7 @@
+   NAMES OpenCL/cl.h CL/cl.h
+   HINTS ${OPENCL_ROOT_DIR}
+   PATH_SUFFIXES include include/nvidia-current
+-  DOC OpenCL include directory
+-  NO_DEFAULT_PATH)
++  DOC OpenCL include directory)
+ 
+ if (X86_64)
+   set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
+@@ -30,8 +29,7 @@
+   NAMES OpenCL
+   HINTS ${OPENCL_ROOT_DIR}
+   PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
+-  DOC OpenCL library
+-  NO_DEFAULT_PATH)
++  DOC OpenCL library)
+ 
+ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+ include(FindPackageHandleStandardArgs)

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-07-05 Thread Ray Rashif

Date: Friday, July 5, 2013 @ 17:55:31
  Author: schiv
Revision: 189711

upgpkg: opencv 2.4.6-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-05 14:52:46 UTC (rev 189710)
+++ PKGBUILD2013-07-05 15:55:31 UTC (rev 189711)
@@ -5,8 +5,8 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.5
-pkgrel=3
+pkgver=2.4.6
+pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -21,7 +21,7 @@
 
source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('8eac87462c7bec8b89021b723207c623'
+md5sums=('c5e8758a419b4f258611b17fc83aafaf'
  'cb916260b5ec594fe7a0cc2e54fc569f'
  '35256e3ccace373feba8131d1540a0de')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-04-29 Thread Evangelos Foutras

Date: Monday, April 29, 2013 @ 17:51:57
  Author: foutrelis
Revision: 183902

upgpkg: opencv 2.4.5-3

libpng 1.6 rebuild.

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 15:40:50 UTC (rev 183901)
+++ PKGBUILD2013-04-29 15:51:57 UTC (rev 183902)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-04-16 Thread Eric Bélanger

Date: Wednesday, April 17, 2013 @ 05:32:36
  Author: eric
Revision: 183054

upgpkg: opencv 2.4.5-2

Rebuild against openexr 2.0.0, Add license for opencv-samples

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 03:28:56 UTC (rev 183053)
+++ PKGBUILD2013-04-17 03:32:36 UTC (rev 183054)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -97,6 +97,10 @@
 
   mkdir -p $pkgdir/usr/share/opencv
   cp -r $srcdir/opencv-samples $pkgdir/usr/share/opencv/samples
+
+  # install license file
+  install -Dm644 $srcdir/opencv-$pkgver/doc/license.txt \
+$pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-04-11 Thread Ray Rashif

Date: Thursday, April 11, 2013 @ 20:36:08
  Author: schiv
Revision: 182636

upgpkg: opencv 2.4.5-1

upstream release
not including doc split anymore
please remove -docs manually since it was an optdep

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 22 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-11 17:24:54 UTC (rev 182635)
+++ PKGBUILD2013-04-11 18:36:08 UTC (rev 182636)
@@ -5,8 +5,8 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.5
+pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,10 +18,10 @@
 optdepends=('opencv-samples'
 'eigen2'
 'python2-numpy: Python 2.x interface')
-source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}a.tar.bz2;
+source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('876dce80ea2648b7e4d4c5a567b4d37b'
+md5sums=('8eac87462c7bec8b89021b723207c623'
  'cb916260b5ec594fe7a0cc2e54fc569f'
  '35256e3ccace373feba8131d1540a0de')
 
@@ -29,9 +29,6 @@
 '-D WITH_OPENGL=ON'
 '-D WITH_TBB=ON'
 '-D WITH_XINE=ON'
-'-D ENABLE_SSE=OFF'
-'-D ENABLE_SSE2=OFF'
-'-D ENABLE_SSE3=OFF'
 '-D BUILD_PACKAGE=OFF'
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
@@ -43,9 +40,18 @@
 '-D CMAKE_INSTALL_PREFIX=/usr'
 '-D CMAKE_SKIP_RPATH=ON')
 
-build() {
-  cd $srcdir/$_realname-$pkgver
+# 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
+
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925
@@ -58,19 +64,23 @@
   # 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
+
   cmake ${_cmakeopts[@]} .
 
   make
 }
 
 package_opencv() {
-  cd $srcdir/$_realname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
 
   # install license file
-  install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
+  install -Dm644 $srcdir/$pkgname-$pkgver/doc/license.txt \
 $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
   cd $pkgdir/usr/share
@@ -85,10 +95,8 @@
   unset optdepends
   unset options
 
-  cd $srcdir
-
   mkdir -p $pkgdir/usr/share/opencv
-  cp -r opencv-samples $pkgdir/usr/share/opencv/samples
+  cp -r $srcdir/opencv-samples $pkgdir/usr/share/opencv/samples
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-03-19 Thread Ray Rashif

Date: Tuesday, March 19, 2013 @ 15:25:54
  Author: schiv
Revision: 180277

dl link changed to 2.4.4a
nothing important in new tarball, so not releasing

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-19 13:37:31 UTC (rev 180276)
+++ PKGBUILD2013-03-19 14:25:54 UTC (rev 180277)
@@ -18,10 +18,10 @@
 optdepends=('opencv-samples'
 'eigen2'
 'python2-numpy: Python 2.x interface')
-source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2;
+source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}a.tar.bz2;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9'
+md5sums=('876dce80ea2648b7e4d4c5a567b4d37b'
  'cb916260b5ec594fe7a0cc2e54fc569f'
  '35256e3ccace373feba8131d1540a0de')

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-03-09 Thread Ray Rashif

Date: Saturday, March 9, 2013 @ 22:06:32
  Author: schiv
Revision: 179823

opencv: scrap doc split

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   46 --
 1 file changed, 8 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 21:04:13 UTC (rev 179822)
+++ PKGBUILD2013-03-09 21:06:32 UTC (rev 179823)
@@ -3,10 +3,10 @@
 # Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -14,10 +14,8 @@
 depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl'
  'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
 makedepends=('cmake' 'python2-numpy' 'mesa'
- 'opencl-headers' 'eigen2'
- 'texlive-bin' 'python2-sphinx') # for docs
-optdepends=('opencv-docs'
-'opencv-samples'
+ 'opencl-headers' 'eigen2')
+optdepends=('opencv-samples'
 'eigen2'
 'python2-numpy: Python 2.x interface')
 
source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2;
@@ -34,7 +32,6 @@
 '-D ENABLE_SSE=OFF'
 '-D ENABLE_SSE2=OFF'
 '-D ENABLE_SSE3=OFF'
-'-D BUILD_DOCS=ON'
 '-D BUILD_PACKAGE=OFF'
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
@@ -58,8 +55,9 @@
   # see http://code.opencv.org/issues/2512
   patch -Np1 -i $srcdir/fsh.patch
 
-  # python2 compatibility for generating docs
-  sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+  # 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
 
   cmake ${_cmakeopts[@]} .
 
@@ -77,33 +75,10 @@
 
   cd $pkgdir/usr/share
 
-  # separate docs package; also be -R friendly
-  [[ -d doc ]]  mv doc $srcdir/opencv-doc
-
-  # separate samples package
+  # separate samples package; also be -R friendly
   [[ -d $pkgname/samples ]]  mv $pkgname/samples $srcdir/opencv-samples
 }
 
-package_opencv-docs() {
-  pkgdesc+= (documentation)
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  # PDFs are not being generated for some reason as of 2.4.4
-  # even after adding latex and sphinx deps
-  # when previously without them there were a couple of good docs installed
-
-  cd $srcdir
-
-  # doc dir now includes opencv subdir (looks like they finally listened)
-  cp -r opencv-doc $pkgdir/usr/share/doc
-
-  # install license file
-  #install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
-  #  $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
 package_opencv-samples() {
   pkgdesc+= (samples)
   depends=('bash')
@@ -114,11 +89,6 @@
 
   mkdir -p $pkgdir/usr/share/opencv
   cp -r opencv-samples $pkgdir/usr/share/opencv/samples
-
-  # Do we really need licenses for these minor splits?
-  # install license file
-  #install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
-  #  $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-03-04 Thread Ray Rashif

Date: Monday, March 4, 2013 @ 23:17:49
  Author: schiv
Revision: 179298

upgpkg: opencv 2.4.4-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-04 22:14:51 UTC (rev 179297)
+++ PKGBUILD2013-03-04 22:17:49 UTC (rev 179298)
@@ -5,8 +5,8 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.3
-pkgrel=5
+pkgver=2.4.4
+pkgrel=1
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -14,7 +14,8 @@
 depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl'
  'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
 makedepends=('cmake' 'python2-numpy' 'mesa'
- 'opencl-headers' 'eigen2')
+ 'opencl-headers' 'eigen2'
+ 'texlive-bin' 'python2-sphinx') # for docs
 optdepends=('opencv-docs'
 'opencv-samples'
 'eigen2'
@@ -22,7 +23,7 @@
 
source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2;
 'pkgconfig.patch'
 'fsh.patch')
-md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
+md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9'
  'cb916260b5ec594fe7a0cc2e54fc569f'
  '35256e3ccace373feba8131d1540a0de')
 
@@ -33,6 +34,7 @@
 '-D ENABLE_SSE=OFF'
 '-D ENABLE_SSE2=OFF'
 '-D ENABLE_SSE3=OFF'
+'-D BUILD_DOCS=ON'
 '-D BUILD_PACKAGE=OFF'
 '-D BUILD_WITH_DEBUG_INFO=OFF'
 '-D BUILD_TESTS=OFF'
@@ -49,12 +51,16 @@
 
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
+  # and http://code.opencv.org/issues/1925
   patch -Np1 -i $srcdir/pkgconfig.patch
 
-  # fix another upstream mess
+  # fix another upstream mess that they won't fix
   # see http://code.opencv.org/issues/2512
   patch -Np1 -i $srcdir/fsh.patch
 
+  # python2 compatibility for generating docs
+  sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+
   cmake ${_cmakeopts[@]} .
 
   make
@@ -72,11 +78,10 @@
   cd $pkgdir/usr/share
 
   # separate docs package; also be -R friendly
-  [ -d doc/$pkgname ]  mv doc/$pkgname $srcdir/opencv-doc \
- rm -r doc
+  [[ -d doc ]]  mv doc $srcdir/opencv-doc
 
   # separate samples package
-  [ -d $pkgname/samples ]  mv $pkgname/samples $srcdir/opencv-samples
+  [[ -d $pkgname/samples ]]  mv $pkgname/samples $srcdir/opencv-samples
 }
 
 package_opencv-docs() {
@@ -85,10 +90,14 @@
   unset optdepends
   options=('docs')
 
+  # PDFs are not being generated for some reason as of 2.4.4
+  # even after adding latex and sphinx deps
+  # when previously without them there were a couple of good docs installed
+
   cd $srcdir
 
-  mkdir -p $pkgdir/usr/share/doc
-  cp -r opencv-doc $pkgdir/usr/share/doc/opencv
+  # doc dir now includes opencv subdir (looks like they finally listened)
+  cp -r opencv-doc $pkgdir/usr/share/doc
 
   # install license file
   #install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2013-02-10 Thread Ionuț Mircea Bîru

Date: Sunday, February 10, 2013 @ 13:38:39
  Author: ioni
Revision: 177866

x264/ffmpeg rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-10 12:23:10 UTC (rev 177865)
+++ PKGBUILD2013-02-10 12:38:39 UTC (rev 177866)
@@ -6,7 +6,7 @@
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.3
-pkgrel=4
+pkgrel=5
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')

1 2 >

1 - 100 of 130 matches

Mail list logo