Upgrade to 1.1.5

2 files changed, 29 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45576c91a616..bc472ce53c46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = python-easyocr-git
 	pkgdesc = Ready-to-use OCR with 40+ languages supported including Chinese, Japanese, Korean and Thai
-	pkgver = 1.1.3.r163.e918f92
+	pkgver = 1.1.5.r261.e8d04d5
 	pkgrel = 1
 	url = https://github.com/JaidedAI/EasyOCR
 	install = python-easyocr-git.install
 	arch = any
-	license = Apache-2.0
+	license = Apache
 	makedepends = python-setuptools
 	makedepends = git
-	depends = python-torchvision
-	depends = python-pytorch
+	depends = python-torchvision>=0.5
 	depends = python-scikit-image
-	depends = python-pillow
-	depends = python-numpy
+	depends = python-pytorch
 	depends = opencv
 	depends = hdf5
-	depends = python-scipy
+	optdepends = python-torchvision-cuda>=0.5
 	provides = python-easyocr
 	conflicts = python-easyocr
 	replaces = python-easyocr
@@ -23,13 +21,10 @@ pkgbase = python-easyocr-git
 	sha256sums = SKIP
 
 pkgname = python-easyocr-git
-	depends = python-torchvision
-	depends = python-pytorch
+	depends = python-torchvision>=0.5
 	depends = python-scikit-image
-	depends = python-pillow
-	depends = python-numpy
+	depends = python-pytorch
 	depends = opencv
 	depends = hdf5
-	depends = python-scipy
 	depends = python
 
diff --git a/PKGBUILD b/PKGBUILD
index 6290fa8c42a9..a209b9034be8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,19 @@
 
 pkgname=python-easyocr-git
 _name=EasyOCR
-pkgver=1.1.3.r163.e918f92
+pkgver=1.1.5.r261.e8d04d5
 pkgrel=1
 pkgdesc="Ready-to-use OCR with 40+ languages supported including Chinese, Japanese, Korean and Thai"
 arch=("any")
 url="https://github.com/JaidedAI/EasyOCR"
-license=("Apache-2.0")
-depends=('python-torchvision' 'python-pytorch' 'python-scikit-image'
-         'python-pillow' 'python-numpy' 'opencv' 'hdf5' 'python-scipy')
+license=("Apache")
+depends=(
+         'python-torchvision>=0.5' 'python-scikit-image'
+         'python-pytorch' 'opencv' 'hdf5'
+)
 makedepends=('python-setuptools' 'git')
-#checkdepends=('python-pytest-runner' 'python-tornado' 'python-nose' 'python-psutil' 'python-trustme'
-#              'python-gcp-devrel-py-tools' 'python-pytest-timeout' 'python-flaky')
+#checkdepends=('python-pytest-runner')
+optdepends=('python-torchvision-cuda>=0.5')
 provides=('python-easyocr')
 conflicts=('python-easyocr')
 replaces=('python-easyocr')
@@ -21,16 +23,21 @@ sha256sums=('SKIP')
 install=${pkgname}.install
 
 prepare() {
-  cd "$srcdir"/${_name} # -${pkgver}
-  sed -i "s/,'opencv-python'//g" setup.py
-  sed -i 's/Pillow<7.0/Pillow/g' setup.py
-  cd easyocr
-  sed -i '4d' detection.py
+    cd "$srcdir"/${_name} # -${pkgver}
+    sed -i "s/opencv-python//g" requirements.txt
+    #sed -i 's/Pillow<7.0/Pillow/g' setup.py
+    cd easyocr
+    sed -i '4d' detection.py
+}
+
+build() {
+    cd "$srcdir"/${_name}
+    python setup.py build
 }
 
 package() {
-  depends+=('python')
-  cd ${_name} #-${pkgver}
-  python setup.py install --root="${pkgdir}"
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+    depends+=('python')
+    cd ${_name} #-${pkgver}
+    python setup.py install --root="${pkgdir}"
+    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }