Updated to version 3.1 & major refactoring of PKGBUILD to try to meet packaging guidelines

3 files changed, 95 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72b43d8bc57a..2cc81d1ddd7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,35 @@
 pkgbase = turbovnc
-	pkgdesc = An optimized version of TightVNC
-	pkgver = 3.0.2
-	pkgrel = 2
+	pkgdesc = A derivative of Virtual Network Computing that is tuned to provide peak performance for 3D and video workloads
+	pkgver = 3.1
+	pkgrel = 1
 	url = http://www.turbovnc.org/
 	arch = i686
 	arch = x86_64
-	license = GPL
-	makedepends = cmake
-	makedepends = rsync
+	arch = aarch64
+	arch = armv7h
+	license = GPL2
+	makedepends = cmake>=3.12
+	makedepends = java-environment>11
+	depends = java-runtime>11
+	depends = libjpeg-turbo
 	depends = libxaw
-	depends = libxt
-	depends = libxi
 	depends = libxcursor
-	depends = libjpeg-turbo
-	depends = java-environment>11
+	depends = libxi
+	depends = libxt
 	depends = openssl
 	depends = python
-	conflicts = turbovnc-bin
 	conflicts = tigervnc
-	conflicts = tigervnc-svn
+	conflicts = tigervnc-git
 	conflicts = tightvnc
-	replaces = turbovnc-bin
-	backup = etc/turbovncserver.conf
-	backup = etc/turbovncserver-security.conf
-	source = turbovnc-3.0.2.tar.gz::https://sourceforge.net/projects/turbovnc/files/3.0.2/turbovnc-3.0.2.tar.gz/download
+	conflicts = tightvnc-git
+	backup = etc/turbovnc/turbovncserver.conf
+	backup = etc/turbovnc/turbovncserver-security.conf
+	source = https://github.com/TurboVNC/turbovnc/releases/download/3.1/turbovnc-3.1.tar.gz
+	source = https://github.com/TurboVNC/turbovnc/releases/download/3.1/turbovnc-3.1.tar.gz.sig
 	source = vncserver.service
-	sha256sums = 616dc72ce52351b70a239c2f464c83136e6143a23c7d316e3b29f68ea71c9949
+	validpgpkeys = AE1A7BA4EFFF9A9987E1474C4BACCAB36E7FE9A1
+	sha256sums = 1a28f685beca1543bb8fc0197459440ddffd099e5948955c61e6998e95364cdb
+	sha256sums = 938a4bb4f87ff096a5d07966c0dc71ca13124338873cdf8fe9d0ae6d5a493b88
 	sha256sums = ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b
 
 pkgname = turbovnc
diff --git a/PKGBUILD b/PKGBUILD
index 4a4baf2ae9dd..2385b8d9bb2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,55 @@
-# Maintainer: Angel de Vicente <angel.de.vicente at iac dot es>
+# Maintainer: Jeremy Gust <jeremy AT plasticsoup DOT net>
+# Contributor: Angel de Vicente <angel.de.vicente at iac dot es>
 # Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
 # Contributor: kfgz <kfgz at interia pl>
 # Contributor: Kaspar Bumke <kaspar dot bumke at gmail dot com>
 # Contributor: maleadt <tim dot besard at gmail dot com>
-
 pkgname="turbovnc"
-pkgdesc="An optimized version of TightVNC"
-pkgver=3.0.2
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgdesc="A derivative of Virtual Network Computing that is tuned to provide peak performance for 3D and video workloads"
+pkgver=3.1
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
 url="http://www.turbovnc.org/"
-license=('GPL')
-makedepends=('cmake' 'rsync')
-depends=('libxaw' 'libxt' 'libxi' 'libxcursor' 'libjpeg-turbo' 'java-environment>11' 'openssl' 'python')
-sha256sums=('616dc72ce52351b70a239c2f464c83136e6143a23c7d316e3b29f68ea71c9949'
+license=('GPL2')
+depends=('java-runtime>11'
+         'libjpeg-turbo'
+         'libxaw'
+         'libxcursor'
+         'libxi'
+         'libxt'
+         'openssl'
+         'python')
+makedepends=('cmake>=3.12'
+             'java-environment>11')
+conflicts=('tigervnc' 'tigervnc-git' 'tightvnc' 'tightvnc-git')
+backup=(etc/turbovnc/turbovncserver.conf
+        etc/turbovnc/turbovncserver-security.conf)
+source=("https://github.com/TurboVNC/turbovnc/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
+        'vncserver.service')
+sha256sums=('1a28f685beca1543bb8fc0197459440ddffd099e5948955c61e6998e95364cdb'
+            '938a4bb4f87ff096a5d07966c0dc71ca13124338873cdf8fe9d0ae6d5a493b88'
             'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b')
-conflicts=('turbovnc-bin' 'tigervnc' 'tigervnc-svn' 'tightvnc')
-replaces=('turbovnc-bin')
-source=(${pkgname}-${pkgver}.tar.gz::https://sourceforge.net/projects/${pkgname}/files/${pkgver}/${pkgname}-${pkgver}.tar.gz/download
-        vncserver.service)
-backup=(etc/turbovncserver.conf
-        etc/turbovncserver-security.conf)
+validpgpkeys=(AE1A7BA4EFFF9A9987E1474C4BACCAB36E7FE9A1) # The VirtualGL Project <information@VirtualGL.org>
 
 build() {
-  mkdir -p "${srcdir}"/${pkgname}-${pkgver}/build
-  export JAVA_HOME=/usr/lib/jvm/default/
-  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/openssl-1.0/pkgconfig
-  cd "${srcdir}"/${pkgname}-${pkgver}/build
-  ln -sf ../CMakeLists.txt
-  cmake -G "Unix Makefiles" \
-        -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so     \
-        -DTJPEG_JNILIBRARY=/usr/lib/libturbojpeg.so  \
-        -DCMAKE_INSTALL_PREFIX=/usr                  \
-        -DTVNC_DOCDIR=/usr/share/doc/${pkgname}      \
-        -DTJPEG_JAR=/usr/share/java/turbojpeg.jar    \
-        ../
-  make
+	cmake -B build \
+			-S "$pkgname-$pkgver" \
+			-DCMAKE_BUILD_TYPE='None' \
+			-DCMAKE_INSTALL_PREFIX='/usr' \
+			-DCMAKE_INSTALL_SYSCONFDIR='/etc/turbovnc' \
+			-Wno-dev \
+			-G "Unix Makefiles" \
+			-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so \
+			-DTJPEG_JNILIBRARY=/usr/lib/libturbojpeg.so \
+			-DTVNC_DOCDIR=/usr/share/doc/$pkgname \
+			-DTJPEG_JAR=/usr/share/java/turbojpeg.jar
+	cmake --build build
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}/build
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/share/man/man1/Xserver.1
-  rm -r "${pkgdir}"/etc/init.d
-  install -D -m644 "${srcdir}"/vncserver.service "${pkgdir}"/usr/lib/systemd/system/vncserver.service
+	install -D -m644 vncserver.service "$pkgdir"/usr/lib/systemd/system/vncserver.service
+	cd build
+	make DESTDIR="$pkgdir" install
+	rm -f "$pkgdir"/usr/share/man/man1/Xserver.1
+	rm -r "$pkgdir"/etc/turbovnc/init.d
 }
diff --git a/keys/pgp/AE1A7BA4EFFF9A9987E1474C4BACCAB36E7FE9A1.asc b/keys/pgp/AE1A7BA4EFFF9A9987E1474C4BACCAB36E7FE9A1.asc
new file mode 100644
index 000000000000..d31cb58fd2d3
--- /dev/null
+++ b/keys/pgp/AE1A7BA4EFFF9A9987E1474C4BACCAB36E7FE9A1.asc
@@ -0,0 +1,32 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBF+0POoBEADvh8UbRhwEb4QdPwD0XqxncnLumwEViosBwZBQBMG7Toymk5oH
+YlQIvDlr2Idj8ClBOEkhGMbH7EFoy55cFqG7RO5cMg442LK44j2LKzMqCuLQwEuf
+LutUH2Ptuzgcd7ATc3od3RSpb8VL1HDtOu584MdKlKtdQU0K+xRtM+kqBzLRhb31
+U4PkQSDitXLG2juRFEN7VsKmr0IjWfjDZEHOLryfQXfEQmZJAO9ZjwKCwHIMxqYy
+lWeit9C1PfBEVP30L5Vdd4vFW9XB9RLUFgMjo57dZGkk4yPDhsNhWe527A4pUOMK
+Up5xLcUXrORjXEFlgh2BEC2Zy6QfRYoKTlpPGVr0g3UeYMFEkMTSsVJiwsITnpWI
+wo0FzCZYBJZQQdQvI57vhRL3Xv7QPPGFnGrXye+WsTB4FQn42JE2h65yG47Dlgbw
+IoMzfDd1pi7HtDl3JLvZzx3qRUk+FOzAKpZcRmpgSIih3pdZLVgQi2gZszXRLXoy
+myiBkcczQk78E/RMh7bTcPxPaGukQojijlYuuLKn3Ff8WkZNrZ6RuRzzAB9qjXrY
+vuALocuVcxaTPHAhoHiFaxwjPamxqlxkoR0tfad35egTqlnUraYYPTiv3XSDbHpv
+he143H/Xh55eNXTZFpkBkqZWJUpt8C1ZR4xXFDy7FSDovfaMRn3rTZ/neQARAQAB
+tFVUaGUgVmlydHVhbEdMIFByb2plY3QgKFNpZ25pbmcga2V5IGZvciBvZmZpY2lh
+bCBiaW5hcmllcykgPGluZm9ybWF0aW9uQFZpcnR1YWxHTC5vcmc+iQI2BBMBAgAg
+BQJftDzqAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQS6zKs25/6aF/vRAA
+usnkL2Ku2dv59NxjazYFqhNgoCPyBrdZw6ODbBvmBNGVeru6TDEcGBl1Nxm5N6/i
+1QcjDquqdRLfcKfZ1aVAF21wSw6bmqlS1o6reHyXFIGmGjZwz6aEntxamWEEEM77
+JR6Ux1F8d8AV+fFHKYrJ6qzWk9EaPtqcIVzMlLLEdcVHV+rLLDgCDyh9w/Ri+Qze
+7QVwXlCF83MrMG3RpaFZ5zX450WrFM0deWGTZG8tx4hw5du95tMluKGXRgsJ+bu6
+9pAPUSEo1+sIt/4Wi8tYBQKY5kAFNVNhyUaZLKtDsErajHiuC0CiV7JTp5ZLY/Jp
+W786cDUOKAFeFCK4PVj32e8blJdRhnds5P0lAPbZ5Swkxm6+rsSVYkwL/adT/Il2
+FCV4hATsSJyNLUTkCYenD2pd/m4opFJW+gkfcbKvDIAcPOyklTaXcoXGwONIEDtI
+3CyIxGARWcdtP0tVQIjVW2ezeytLinpq0cGXXiKr0YSdAtHA1KDAuEwgQNg5/9EG
+hW3XbJNbhm4uoPNUs+D4H4DwWgwSOjbnOAq8Y2jy4WAD4vaHEyM9toI2/sYWalpD
+NUKgSg+UooTl4g50bIxnexxhMZO1wpI8Iyc5GzEUXa/xJYwYQoaCoYhqj74/os3b
+1v5c0yFLUsuQVPNyWCc8cc6gYax6ERV1Ea8r9oIErdmIRgQTEQIABgUCX7Q9QgAK
+CRBrvvoZcv65zo8GAJ9USq5Fvj0Y9udLD08CeZIG/UrbegCbB0pog/SgEUsGnvgC
+XvdHQsf4fT4=
+=fRy4
+-----END PGP PUBLIC KEY BLOCK-----