update to MultiVN 0.6 GIT version

2 files changed, 32 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8607fabc30a3..a05481185ec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Apr 26 23:30:08 UTC 2020
 pkgbase = multivnc-git
 	pkgdesc = MultiVNC is a cross-platform Multicast-enabled VNC viewer using wxWidgets and libvncclient
-	pkgver = 1.6.4.r4.g18c96f6
+	pkgver = MultiVNC.0.3.r845.gcb26df0
 	pkgrel = 1
 	url = http://github.com/bk138/multivnc
 	arch = i686
@@ -10,6 +12,10 @@ pkgbase = multivnc-git
 	provides = multivnc
 	conflicts = multivnc
 	source = multivnc-git::git+https://github.com/bk138/multivnc.git
+	source = git+https://github.com/bk138/wxservdisc.git
+	source = git+https://github.com/LibVNC/libvncserver.git
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = multivnc-git
diff --git a/PKGBUILD b/PKGBUILD
index 8e6384f1b386..00406ed7de95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=multivnc-git
 pkgname=$pkgbase
-pkgver=1.6.4.r4.g18c96f6
+pkgver=MultiVNC.0.3.r845.gcb26df0
 pkgrel=1
 pkgdesc='MultiVNC is a cross-platform Multicast-enabled VNC viewer using wxWidgets and libvncclient'
 arch=(i686 x86_64)
@@ -13,25 +13,41 @@ makedepends=('git')
 conflicts=('multivnc')
 provides=('multivnc')
 
-source=("$pkgname"::'git+https://github.com/bk138/multivnc.git')
-md5sums=('SKIP')
+source=("$pkgname"::'git+https://github.com/bk138/multivnc.git'
+        "git+https://github.com/bk138/wxservdisc.git"
+        "git+https://github.com/LibVNC/libvncserver.git")
+
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP')
+
+prepare() {
+  cd $srcdir/$pkgname
+  git submodule init
+  git config submodule.wxservdisc.git.url $srcdir/wxservdisc
+  git config submodule.libvncserver.git.url $srcdir/libvncserver
+  git submodule update
+}
+
 
 pkgver() {
-cd "$srcdir/$pkgname"
-git describe --long --tags | sed -r 's/AndroidMultiVNC-//;s/([^-]*-g)/r\1/;s/-/./g'
+  cd "$srcdir/$pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+
 build() {
   cd "$srcdir/$pkgname"
 
-  autoreconf -i
-  ./configure --prefix=/usr
-  make || return 1
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
+  cmake --build .
 
 }
 
 package() {
-cd "$srcdir/$pkgname"
+cd "$srcdir/$pkgname/build"
 make DESTDIR="$pkgdir" install
 }