From 96722e1ac45d13961ffce366a7c1d2e8d8436358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Sat, 1 Aug 2015 19:04:37 -0300
Subject: opencv-2.4.11-1.parabola2: updating revision

* unnecessary stuff and nonfree references should be removed by us from packaging instead of librefetch
* replace "open" to "free" term to pkgdesc -> https://www.gnu.org/philosophy/words-to-avoid.html.en#Open
* our tarball should have "libre" suffix
---
 libre/opencv/PKGBUILD | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'libre/opencv')

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 8535c6837..e05aa2607 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id$
+# $Id: PKGBUILD 242915 2015-08-01 10:41:34Z schiv $
 # Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=opencv
 pkgname=opencv
 pkgver=2.4.11
-pkgrel=1.parabola1
-pkgdesc="Open Source Computer Vision Library, without nonfree and 3rdparty modules and Milky icons"
+pkgrel=1.parabola2
+pkgdesc="Free Computer Vision Library, without nonfree SIFT algorithm and Milky icons"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
@@ -18,9 +19,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")
+source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip")
 mkmd5sums=('32f498451bff1817a60e1aabc2939575')
-md5sums=('57b9856922b1fcf067f77f9fa14f1da7')
+md5sums=('2d33fcdfb2687bb5adcd5ab7bac8f1c3')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -47,11 +48,23 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 [[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
 
 mksource() {
-  cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # remove nonfree SIFT algorithm that is patented in some countries and have some other limitations on the use
+ rm -rv modules/nonfree/src/sift.cpp
+
+ # remove nonfree Milky icons
+ rm -rv modules/highgui/src/files_Qt/Milky
+}
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # remove useless folder
+ rm -rv 3rdparty
 
-  rm -rv 3rdparty
-  rm -rv modules/nonfree
-  rm -rv modules/highgui/src/files_Qt/Milky
+ # remove nonfree SIFT references
+ rm -rv modules/nonfree
 }
 
 build() {
@@ -77,7 +90,7 @@ package_opencv() {
 
   # separate samples package; also be -R friendly
   if [[ -d OpenCV/samples ]]; then
-    mv OpenCV/samples "$srcdir/$pkgname-samples"
+    rm -r OpenCV/samples
     mv OpenCV $pkgname # otherwise folder naming is inconsistent
   elif [[ ! -d OpenCV ]]; then
     warning "Directory naming issue; samples package may not be built!"
-- 
cgit v1.2.2