remove assimp download, and change some flags in gcc compiler to allow it to be compiled with gcc 11

2 files changed, 7 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f7ddff7f300..dec4013eeba5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yoga
 	pkgdesc = Yummy Optimizer for Gorgeous Assets
 	pkgver = 1.0.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/wanadev/yoga
 	arch = any
 	license = unknown
@@ -15,9 +15,7 @@ pkgbase = yoga
 	depends = python-zopflipy
 	depends = assimp
 	source = https://files.pythonhosted.org/packages/source/y/yoga/yoga-1.0.0.tar.gz
-	source = assimp-5.0.1.tar.gz::https://github.com/assimp/assimp/archive/refs/tags/v5.0.1.tar.gz
 	sha256sums = a4e7010969602b42af2ca74c95126ee533e3cf9ea9fdaa0c5c316eec7d985f53
-	sha256sums = 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
 
 pkgname = yoga
 	depends = python3
diff --git a/PKGBUILD b/PKGBUILD
index 96f31435643a..da40d24d6e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,25 @@
 pkgname=('yoga')
 _module='yoga'
 pkgver='1.0.0'
-pkgrel=4
+pkgrel=5
 pkgdesc="Yummy Optimizer for Gorgeous Assets"
 url="https://github.com/wanadev/yoga"
 depends=(python3 python-cffi python-pillow python-pycparser python-unidecode python-pyguetzli python-zopflipy assimp)
 makedepends=('python-setuptools')
 license=('unknown')
 arch=('any')
-source=("https://files.pythonhosted.org/packages/source/${_module::1}/$_module/$_module-$pkgver.tar.gz"
-        "assimp-5.0.1.tar.gz::https://github.com/assimp/assimp/archive/refs/tags/v5.0.1.tar.gz")
-sha256sums=('a4e7010969602b42af2ca74c95126ee533e3cf9ea9fdaa0c5c316eec7d985f53'
-            '11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc')
+source=("https://files.pythonhosted.org/packages/source/${_module::1}/$_module/$_module-$pkgver.tar.gz")
+sha256sums=('a4e7010969602b42af2ca74c95126ee533e3cf9ea9fdaa0c5c316eec7d985f53')
 
 build() {
     cd "${srcdir}/${_module}-${pkgver}"
-    if [ -e assimp/build ]; then
-      rmdir assimp/build
-      rmdir assimp
-      ln -s ../assimp-5.0.1 assimp
-    fi
+    sed -i 's/--std=c++11/-Wno-error=stringop-overflow -Wno-error=array-bounds/' setup.py
     python3 setup.py build_py
+    python3 yoga/model/assimp_build.py
 }
 
 package() {
     depends+=()
     cd "${srcdir}/${_module}-${pkgver}"
-    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }