opencv: Removing xfeatures2d modules and Lena images

1 files changed, 15 insertions, 12 deletions

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 20e706163..9d1ccddc2 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=opencv
 pkgname=opencv
 pkgver=3.1.0
 pkgrel=3.parabola1
-pkgdesc="Free Computer Vision Library, without nonfree SIFT algorithm and nonfree Milky icons"
+pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
 arch=('i686' 'x86_64' 'armv7h')
 license=('BSD')
 url="http://opencv.org/"
@@ -20,13 +20,13 @@ optdepends=('opencv-samples'
             'libcl: For coding with OpenCL'
             'python-numpy: Python 3 interface'
             'python2-numpy: Python 2 interface')
-mksource=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip")
+mksource=("$pkgbase-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
+          "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip"
-        "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz"
         '5852.patch')
-mkmd5sums=('91b88a4e56509ea741c3e11f42ea738b')
-md5sums=('7a5f152bdbd730928aaebf1dcb960747'
-         'a822839ad3ab79ff837c16785ea9dd10'
+mkmd5sums=('6082ee2124d4066581a7386972bfd52a'
+           'a822839ad3ab79ff837c16785ea9dd10')
+md5sums=('4744e2bacaf185ce02f051de1cf9d6ac'
          '5bd9cd736b171c15cedee3a32a0c47ff')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
@@ -55,22 +55,25 @@ _cmakeopts=('-D WITH_OPENCL=ON'
                '-D ENABLE_SSE3=OFF')
 
 mksource() {
-  cd "$srcdir/$pkgname_contrib-$pkgver"
+  cd "$srcdir/opencv_contrib-$pkgver"
 
-  # remove nonfree SIFT algorithm that is patented in some countries and have some other limitations on the use
-  rm -rv modules/xfeatures2d/src/sift.cpp
+  # remove nonfree SIFT and SURF algorithms that are patented in some countries and have some other limitations on the use
+  rm -v modules/xfeatures2d/src/{sift,surf}.cpp
 
   cd "$srcdir/$pkgname-$pkgver"
 
   # remove nonfree Milky icons
   rm -rv modules/highgui/src/files_Qt/Milky
+
+  # remove nonfree lena.png and lena.jpg images
+  rm -v $(find . -iname '*lena*')
 }
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/opencv_contrib-$pkgver"
 
-  # remove nonfree SIFT references
-  rm -rv modules/nonfree
+  # remove nonfree SIFT and SURF references
+  rm -rv modules/xfeatures2d
 
   cd "$srcdir/$pkgname-$pkgver"