Upgraded to 3.0.0

6 files changed, 26 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 330c24ab39f2..0516a5545bbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,23 @@
 # Generated by mksrcinfo v8
-# Wed Dec 14 19:39:42 UTC 2016
+# Sun Sep 17 18:43:52 UTC 2017
 pkgbase = oqapy
 	pkgdesc = An application intended to sort files of the image type in graphic mode.
-	pkgver = 2.5.0
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = http://www.oqapy.eu/
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL
-	depends = python2-pyqt
-	depends = python2-exiv2
-	depends = python2-numpy
-	depends = pyexiv2
+	depends = python-oqapy-iproc
+	depends = liboqapy-iproc
+	depends = python-pillow
+	depends = python-pyqt5
+	depends = python-exiv2
+	depends = python-numpy
 	depends = gphoto2
 	depends = dcraw
-	depends = python2-imaging
 	depends = opencv
-	depends = opencv2-opt
-	source = http://www.oqapy.eu/releases/oqapy-2.5.0.tar.gz
-	source = https://launchpad.net/oqapy/trunk/oqapy/+download/oqapy-iproc.0.1.0.tar.gz
-	source = oqapy.sh
-	source = https://launchpad.net/oqapy/trunk/oqapy/+download/python-oqapy-iproc.0.1.1.tar.gz
-	source = c_hist.patch
-	source = opencv.patch
-	sha256sums = 34904d957fb0d7e07d8cad620a1b5fc78207e7f7e8f8ac7eca24181a4b2eb902
-	sha256sums = 68842337327a1ecd062d2940d2bebc27fd27ca7448a9743dcc2cd6f8aec83cbc
-	sha256sums = 87b5f1c69c4ec9812366987372a3ab476b70e95b25cd03eb170b45ee0667f93a
-	sha256sums = 91e63ee25ef87587e47ca80e06c01c5d0967d042878210d17e0f30bc264f8c63
-	sha256sums = 5e560616a135302fecb275c16921ecd8b472607782c7334fdf6912d5545bacef
-	sha256sums = 5bcef10f039c0768c38f222e3f34023cafb0a90598767ac21dad7244e5b7656d
+	source = http://www.oqapy.eu/releases/oqapy-3.0.0.tar.gz
+	sha256sums = c0f5704ff520ea7457d9722a70a3f6127bed48c0bfbf3adf99840f7967950440
 
 pkgname = oqapy
 
-pkgname = oqapy-iproc
-
-pkgname = python-oqapy-iproc
-
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 7befac1eb5c5..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3b06f103..60bb737f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@ HFILES = sipAPIoqapy_iproc.h
- CC = gcc
- CXX = g++
- LINK = g++
--CPPFLAGS = -DNDEBUG -I. -I/usr/include/python2.7
-+CPPFLAGS = -DNDEBUG -I. -I/usr/include/python2.7 -I../src
- CFLAGS = -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fPIC -O2 -Wall -W
- CXXFLAGS = -pipe -fPIC -O2 -Wall -W
- LFLAGS = -Wl,-O1,--sort-common,--as-needed,-z,relro -shared -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib/x86_64-linux-gnu/ -Wl,--version-script=oqapy_iproc.exp
diff --git a/PKGBUILD b/PKGBUILD
index 4d45dd07360f..345ab71b1595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,69 +1,27 @@
 # Maintainer: dracorp aka Piotr Rogoza <piotr.r.public@gmail.com>
 # Contributor: Huguenin Loïs <huguenindl at gmail dot com>
 
-pkgbase=oqapy
-pkgname=($pkgbase{,-iproc} python-$pkgbase-iproc)
-# pkgname=oqapy
-pkgver=2.5.0
+pkgname=oqapy
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="An application intended to sort files of the image type in graphic mode."
-arch=(i686 x86_64)
+arch=(any)
 url="http://www.oqapy.eu/"
 license=('GPL')
 depends=(
-python2-pyqt
-python2-exiv2
-python2-numpy
-pyexiv2
+python-oqapy-iproc
+liboqapy-iproc
+python-pillow
+python-pyqt5
+python-exiv2
+python-numpy
 gphoto2
 dcraw
-python2-imaging
 opencv
-opencv2-opt
 )
-source=(
-http://www.oqapy.eu/releases/$pkgname-$pkgver.tar.gz
-https://launchpad.net/oqapy/trunk/oqapy/+download/oqapy-iproc.0.1.0.tar.gz
-oqapy.sh
-https://launchpad.net/oqapy/trunk/oqapy/+download/python-oqapy-iproc.0.1.1.tar.gz
-c_hist.patch
-opencv.patch
-)
-sha256sums=('34904d957fb0d7e07d8cad620a1b5fc78207e7f7e8f8ac7eca24181a4b2eb902'
-            '68842337327a1ecd062d2940d2bebc27fd27ca7448a9743dcc2cd6f8aec83cbc'
-            '87b5f1c69c4ec9812366987372a3ab476b70e95b25cd03eb170b45ee0667f93a'
-            '91e63ee25ef87587e47ca80e06c01c5d0967d042878210d17e0f30bc264f8c63'
-            '5e560616a135302fecb275c16921ecd8b472607782c7334fdf6912d5545bacef'
-            '5bcef10f039c0768c38f222e3f34023cafb0a90598767ac21dad7244e5b7656d')
-prepare() {
-  cd $srcdir/python-oqapy-iproc.0.1.1
-  rm -f liboqapy-iproc.so
-  patch -p1 -i $srcdir/opencv.patch
-  patch -p1 -i $srcdir/c_hist.patch
-
-  cd $srcdir/oqapy-iproc.0.1.0
-  rm -f liboqapy-iproc.so
-}
-build(){
-  msg2 "Building oqapy-iproc library"
-  cd $srcdir/oqapy-iproc.0.1.0
-  sh ./build.sh
-
-  msg2 "Building oqapy-iproc python module"
-  cd $srcdir/python-oqapy-iproc.0.1.1
-  python2 configure.py
-  sed -e "12 s#\$# -L$srcdir/oqapy-iproc.0.1.0#" -i Makefile
-  make
-}
-package_oqapy-iproc() {
-  cd $srcdir/oqapy-iproc.0.1.0
-  install -Dm644 liboqapy-iproc.so $pkgdir/usr/lib/liboqapy-iproc.so
-}
-package_python-oqapy-iproc(){
-  cd $srcdir/python-oqapy-iproc.0.1.1
-  make DESTDIR=$pkgdir install
-}
-package_oqapy() {
+source=(http://www.oqapy.eu/releases/$pkgname-$pkgver.tar.gz)
+sha256sums=('c0f5704ff520ea7457d9722a70a3f6127bed48c0bfbf3adf99840f7967950440')
+package() {
   cd "$srcdir"/$pkgname-$pkgver
 
   install -dm755 "$pkgdir"/usr/bin
@@ -72,14 +30,12 @@ package_oqapy() {
   install -dm755 "$pkgdir"/usr/share/applications
   install -dm755 "$pkgdir"/usr/share/man/man1
 
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-  -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-  -e "s|\"python\"|\"python2\"|" \
-  $(find . -name "$pkgname.py" -or -name "$pkgname" -and -perm -o+rx -type f)
+
   cp -R ./ $pkgdir/usr/share/oqapy
   mv $pkgdir/usr/share/oqapy/oqapy.1 $pkgdir/usr/share/man/man1
   mv $pkgdir/usr/share/oqapy/oqapy.desktop  $pkgdir/usr/share/applications/
   install -Dm644 $pkgdir/usr/share/oqapy/medias/oqapy_ic_48.png \
     "$pkgdir"/usr/share/pixmaps/
-  install -Dm755 $srcdir/oqapy.sh $pkgdir/usr/bin/oqapy
+  cd "$pkgdir/usr/bin"
+  ln -s /usr/share/oqapy/oqapy
 }
diff --git a/c_hist.patch b/c_hist.patch
deleted file mode 100644
index b29350d8a5e4..000000000000
--- a/c_hist.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/oqapy-iproc.h b/oqapy-iproc.h
-index c52bb0b1..554112b3 100644
---- a/oqapy-iproc.h
-+++ b/oqapy-iproc.h
-@@ -52,7 +52,7 @@ private :
-     Mat b_hist;
-     Mat g_hist;
-     Mat r_hist;
--    float c_hist[];
-+    float* c_hist;
-     void getColorHistogram();
-     void setContrastStretching(int min, int max, int index);
- 
diff --git a/opencv.patch b/opencv.patch
deleted file mode 100644
index 0c99157ee0a4..000000000000
--- a/opencv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/configure.py b/configure.py
-index f17db980..debc9197 100644
---- a/configure.py
-+++ b/configure.py
-@@ -14,14 +14,14 @@ os.system(" ".join([config.sip_bin, "-c", ".", "-b", build_file, "oqapy_iproc.si
- # Create the Makefile.
- makefile = sipconfig.SIPModuleMakefile(config, build_file)
- 
--makefile.extra_lib_dirs=["/usr/lib", "/usr/lib/x86_64-linux-gnu/"]
-+makefile.extra_lib_dirs=["/usr/lib", "/usr/lib/x86_64-linux-gnu/", "../src/oqapy-iproc.0.1.0"]
- 
- # Add the library we are wrapping.  The name doesn't include any platform
- # specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the
- # ".dll" extension on Windows).
--makefile.extra_libs = ["opencv_core", "opencv_highgui", "opencv_imgproc", 
--                        "opencv_legacy", "opencv_contrib", "opencv_features2d", 
--                        "opencv_ml", "opencv_gpu", "oqapy-iproc"]
-+makefile.extra_libs = ["opencv_core", "opencv_highgui", "opencv_imgproc",
-+                        "opencv_features2d",
-+                        "opencv_ml", "oqapy-iproc"]
- 
- # Generate the Makefile itself.
- makefile.generate()
diff --git a/oqapy.sh b/oqapy.sh
deleted file mode 100755
index 6b1440a39df4..000000000000
--- a/oqapy.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-PYTHONPATH+=:/opt/opencv2/lib/python2.7/site-packages
-LD_LIBRARY_PATH+=:/opt/opencv2/lib
-export PYTHONPATH
-export LD_LIBRARY_PATH
-cd /usr/share/oqapy
-python2 ./oqapy "$@"