Update to version 9.8

4 files changed, 39 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1bad8780668..6a1c21e9ff13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = immersed
-	pkgdesc = Immersed Agent
-	pkgver = 1.9.0
+	pkgdesc = Immersed Desktop Agent
+	pkgver = 9.8
 	pkgrel = 1
-	url = https://immersedvr.com/
+	url = https://immersed.com/
 	arch = x86_64
 	license = unknown
-	depends = libpng
-	depends = curl
-	depends = libva
-	noextract = Immersed_amd64.deb
-	source = https://immersedvr.com/dl/Immersed_amd64.deb
-	md5sums = 44406c6e48297d4881fbb02aa56a68ba
+	makedepends = gendesk
+	depends = fuse
+	optdepends = V4L2LOOPBACK-MODULE: Virtual webcam support
+	noextract = Immersed-x86_64.AppImage
+	options = !strip
+	source_x86_64 = Immersed-x86_64.AppImage::https://static.immersed.com/dl/Immersed-x86_64.AppImage
+	source_x86_64 = immersed.png::https://immersed.com/assets/favicon/android-icon-192x192-202d04a8c19d3974616bc5dd9136796dbc04f4c10a4b32277d5eeb0d22e846b0.png
+	md5sums_x86_64 = 86145b83b81bc33b13434a86a3739b6f
+	md5sums_x86_64 = SKIP
 
 pkgname = immersed
-
diff --git a/.gitignore b/.gitignore
index 9193375171c9..ac3172d67dc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 src
 pkg
 *.deb
-*.pkg*
\ No newline at end of file
+*.pkg*
+*.png
+*.AppImage
diff --git a/PKGBUILD b/PKGBUILD
index 0eae0ce1a72a..3070b8db44e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,35 @@
-# Maintainer: Harrison Oates <harrison at harrisonoates dot com>
-# Upstream: Immersed Inc. <info at immersedvr dot com>
+# Maintainer: Joseph DiGiovanni <jdigiovanni78 at gmail dot com>
+# Upstream: Immersed Inc. <info at immersed dot com>
 pkgname=immersed
-pkgver=9.4.0
+pkgver=9.8
 pkgrel=1
-pkgdesc="Immersed Agent"
+pkgdesc="Immersed Desktop Agent"
 arch=("x86_64")
-url="https://immersedvr.com/"
+url="https://immersed.com/"
 license=('unknown')
-depends=("libpng" "curl" "libva")
-source=("https://static.immersed.com/dl/Immersed-x86_64.AppImage")
-noextract=("Immersed-x86_64.AppImage")
-md5sums=('4abcf0b4873dceeafe6e723dd0527ea9')
-
-pkgver() {
-    ar p Immersed_amd64.deb control.tar.gz | tar zx ./control -O | grep "Version" | sed 's/^Version: \([0-9.]*\)$/\1/g'
-}
+makedepends=("gendesk")
+depends=("fuse")
+optdepends=('V4L2LOOPBACK-MODULE: Virtual webcam support')
+options=(!strip)
+_appimage="Immersed-x86_64.AppImage"
+_icon="${pkgname}.png"
+source_x86_64=("${_appimage}::https://static.immersed.com/dl/Immersed-x86_64.AppImage" "${_icon}::https://immersed.com/assets/favicon/android-icon-192x192-202d04a8c19d3974616bc5dd9136796dbc04f4c10a4b32277d5eeb0d22e846b0.png")
+noextract=("${_appimage}")
+md5sums_x86_64=('86145b83b81bc33b13434a86a3739b6f'
+                SKIP)
 
 prepare() {
-    ar p Immersed_amd64.deb data.tar.xz | tar Jx
-
-    sed -i "s/Exec=.*/Exec=\/usr\/bin\/immersed %u/g" $srcdir/usr/share/applications/immersed-handler.desktop
+    gendesk -f -n --name="Immersed" --pkgname=${pkgname} --pkgdesc=${pkgdesc} --exec=${pkgname} --icon=${srcdir}/${_icon}
 }
 
 package() {
-    mkdir -p $pkgdir/usr/local
-    mkdir -p $pkgdir/usr/share/
+    install -Dm755 "${srcdir}/${_appimage}" "${pkgdir}/opt/${pkgname}/${_appimage}"
 
-    cp -r $srcdir/usr/local/bin $pkgdir/usr/local/
-    cp -r $srcdir/usr/share/applications $pkgdir/usr/share/
-    mv $pkgdir/usr/local/bin/Immersed $pkgdir/usr/local/bin/immersed
+    # Symlink executable
+    mkdir -p "${pkgdir}/usr/bin"
+    ln -s "/opt/${pkgname}/${_appimage}" "${pkgdir}/usr/bin/${pkgname}"
+    
+    # Install desktop entry
+    install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/${_icon}" "${pkgdir}/usr/share/icons/${_icon}"
 }
diff --git a/upd.sh b/upd.sh
deleted file mode 100755
index 07db616a4917..000000000000
--- a/upd.sh
+++ /dev/null
@@ -1 +0,0 @@
-updpkgsums && makepkg -sf && makepkg --printsrcinfo > .SRCINFO