update to 2.9.1

3 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0bac6d28d47..357d450b3d84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
-# Generated by mksrcinfo v8
-# Fri Jun  5 12:53:28 UTC 2020
 pkgbase = libqglviewer
 	pkgdesc = C++ library based on Qt that eases the creation of OpenGL 3D viewers
-	pkgver = 2.7.2
+	pkgver = 2.9.1
 	pkgrel = 1
-	url = http://www.libqglviewer.com/
+	url = https://github.com/GillesDebunne/libQGLViewer
 	arch = i686
 	arch = x86_64
+	arch = aarch64
 	license = GPL2
 	license = GPL3
 	license = custom
-	depends = qt5-base
+	makedepends = cmake
+	depends = qt6-base
 	depends = glu
-	depends = mesa
-	depends = qt5-tools
+	depends = libglvnd
 	conflicts = libqglviewer-qt4
-	options = !makeflags
-	source = http://www.libqglviewer.com/src/libQGLViewer-2.7.2.tar.gz
-	md5sums = a9d965d1ce41f7db6b34f440bb74f061
+	source = libqglviewer-2.9.1.tar.gz::https://github.com/GillesDebunne/libQGLViewer/archive/refs/tags/v2.9.1.tar.gz
+	sha256sums = ea4f9ac627c136a6851ffd3763b154f21c87a58bcec4e5d5b2d07e65a403096b
 
 pkgname = libqglviewer
-
diff --git a/PKGBUILD b/PKGBUILD
index 9afc77e6f2c5..9eee37042833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,39 +5,34 @@
 
 pkgname=libqglviewer
 _pkgname=libQGLViewer
-pkgver=2.7.2
+pkgver=2.9.1
 pkgrel=1
 pkgdesc="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
-url="http://www.libqglviewer.com/"
-depends=('qt5-base' 'glu' 'mesa' 'qt5-tools')
+url="https://github.com/GillesDebunne/libQGLViewer"
+arch=('i686' 'x86_64' 'aarch64')
+depends=('qt6-base' 'glu' 'libglvnd')
+makedepends=('cmake')
 conflicts=('libqglviewer-qt4')
-arch=('i686' 'x86_64')
 license=('GPL2' 'GPL3' 'custom')
-source=("http://www.libqglviewer.com/src/${_pkgname}-${pkgver}.tar.gz")
-
-md5sums=('a9d965d1ce41f7db6b34f440bb74f061')
-
-options=(!makeflags)
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
+sha256sums=('ea4f9ac627c136a6851ffd3763b154f21c87a58bcec4e5d5b2d07e65a403096b')
 
 build()
 {
-  cd ${_pkgname}-${pkgver}
-  qmake PREFIX=/usr -o Makefile ${_pkgname}-${pkgver}.pro || return 1
-  make \
-    CFLAGS="-pipe ${CFLAGS} -D_REENTRANT -Wall -W -fPIC \$(DEFINES)" \
-    CXXLIBS=" ${CXXLIBS} " \
-    CXXFLAGS="-pipe ${CXXFLAGS} -I/usr/include/GL -D_REENTRANT -Wall -W -fPIC \$(DEFINES)" || return 1
-
 
+  cmake -B build -S ${_pkgname}-${pkgver} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=None
+  cmake --build build
 }
 
 package()
 {
-  cd ${_pkgname}-${pkgver}
-
-  make install INSTALL_ROOT="$pkgdir" || return 1
+  cd "$srcdir"/build
+  make install DESTDIR="${pkgdir}"
 
+  cd "$srcdir"/${_pkgname}-${pkgver}
   # Install license.
-  install -d -m 0755 "${pkgdir}"/usr/share/licenses/$pkgname/ || return 1
-  install -m 0644 LICENCE GPL_EXCEPTION "${pkgdir}"/usr/share/licenses/$pkgname/ || return 1
+  install -d -m 0755 "${pkgdir}"/usr/share/licenses/$pkgname/
+  install -m 0644 LICENCE GPL_EXCEPTION "${pkgdir}"/usr/share/licenses/$pkgname/
 }
diff --git a/qglviewer.patch b/qglviewer.patch
deleted file mode 100644
index c11e2f7c3fb7..000000000000
--- a/qglviewer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rNu libQGLViewer-2.6.2-orig/libQGLViewer-2.6.3.pro libQGLViewer-2.6.3/libQGLViewer-2.6.2.pro
---- libQGLViewer-2.6.2-orig/libQGLViewer-2.6.3.pro	2014-02-13 09:38:59.000000000 +0100
-+++ libQGLViewer-2.6.2/libQGLViewer-2.6.3.pro	2014-03-05 21:32:07.736397390 +0100
-@@ -1,6 +1,6 @@
- CONFIG       += ordered
- TEMPLATE      = subdirs
--SUBDIRS       = QGLViewer examples examples/contribs designerPlugin
-+SUBDIRS       = QGLViewer designerPlugin
- 
- QT_VERSION=$$[QT_VERSION]
-