From 7f39d8947adfff989fb9136a0311b800a8d682d5 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 1 Aug 2015 16:28:20 -0500
Subject: opencv-2.4.11-1.parabola1: updating version

---
 libre/opencv/PKGBUILD | 60 ++++++++-------------------------------------------
 1 file changed, 9 insertions(+), 51 deletions(-)

(limited to 'libre/opencv/PKGBUILD')

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index d6d7a707b..8535c6837 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.10
-pkgrel=3.parabola1
+pkgname=opencv
+pkgver=2.4.11
+pkgrel=1.parabola1
 pkgdesc="Open Source Computer Vision Library, without nonfree and 3rdparty modules and Milky icons"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,15 +18,9 @@ optdepends=('opencv-samples'
             'libcl: For coding with OpenCL'
             'python2-numpy: Python 2.x interface')
 mksource=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip")
-source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.zip"
-        'pkgconfig.patch'
-        'fsh.patch'
-        'x86_asmfix.patch')
-mkmd5sums=('ec63952d3a3dff965d5fdde765926821')
-md5sums=('1cf568ec12de8a3f786cd2d851b0f001'
-         'c7cea48ed7d4f729ebdb9673bac41bd3'
-         'c597598d142dd34d0eb4af7d6e9779d8'
-         'b937d3589a62666f17f6dc93e0109717')
+source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.zip")
+mkmd5sums=('32f498451bff1817a60e1aabc2939575')
+md5sums=('57b9856922b1fcf067f77f9fa14f1da7')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -53,34 +47,11 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 [[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
 
 mksource() {
- cd "$srcdir/$pkgname-$pkgver"
-
- rm -rv 3rdparty
- rm -rv modules/nonfree
- rm -rv modules/highgui/src/files_Qt/Milky
-}
-
-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
-  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
+  rm -rv 3rdparty
+  rm -rv modules/nonfree
+  rm -rv modules/highgui/src/files_Qt/Milky
 }
 
 build() {
@@ -113,17 +84,4 @@ package_opencv() {
   fi
 }
 
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=("opencv=$pkgver") # sample codes change with lib/API
-  unset optdepends
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3