v0.9.41

3 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e1a6324edc6..1778a0fca3ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bubbleupnpserver
 	pkgdesc = Stream content to Android devices over the Internet, requires UPNP/DNLA backend e.g. miniDLNA, Gerbera, Mediatomb
-	pkgver = 0.9.38
-	pkgrel = 3
+	pkgver = 0.9.41
+	pkgrel = 1
 	url = http://www.bubblesoftapps.com/bubbleupnpserver/
 	install = bubbleupnpserver.install
 	arch = any
@@ -10,22 +10,19 @@ pkgbase = bubbleupnpserver
 	optdepends = ffmpeg: for transcoding
 	backup = etc/conf.d/bubbleupnpserver.config
 	backup = var/lib/bubbleupnp/configuration.xml
-	source = launch.sh
+	source = bubbleupnpserver.sh
 	source = bubbleupnpserver.service
 	source = bubbleupnpserver.config
 	source = bubbleupnpserver-sysuser.conf
 	source = bubbleupnpserver
-	source = https://bubblesoftapps.com/bubbleupnpserver/core/bcprov-jdk16-146.jar
-	source = https://bubblesoftapps.com/bubbleupnpserver/core/BubbleUPnPServerLauncher.jar
+	source = BubbleUPnPServer-distrib-2021-08-26-18.zip::https://bubblesoftapps.com/bubbleupnpserver/BubbleUPnPServer-distrib.zip
 	source = bubbleupnpserver-LICENCE.txt::https://bubblesoftapps.com/bubbleupnpserver/core/LICENCE.txt
 	sha256sums = 7df801995e65a79eb5140814ca80c4caeee7e1282b69acff9e74201cbaafdaf3
 	sha256sums = b99d60122343959f2118f6f74968e105d63e8ca2c8ff71efc120415378b1175a
 	sha256sums = 61bf63a84b839b85c0fdf0210310c94242bbb6e1aa69bf0d6c46efa013b52ae5
 	sha256sums = fd764bb4c785ab0e2481d26f4f30656ba756949afa8ed949234e722ded87bf04
 	sha256sums = 105bfe44a43d141457bf87ef89c76a5be57f54cdb3493ae3af99c8ad6a938c36
-	sha256sums = d0ae14598f9c528d2ab7bb8ed00e785a5440f692712cd362d69328aba25efb57
-	sha256sums = 75f31ca14d65f0e077283d15e5715636ea74c7faa0e200c5dd34e6ca50b9a06c
-	sha256sums = 69420fd34964ad7404efd9f19fad969f608660af85850fb90d343f2fc6eb9b48
+	sha256sums = e777c802464c48b711b01ae180b0948df8a3ac15f422007cec21a2a17d53d833
+	sha256sums = ceb8ba5042568cd04e7c47f4e4416278bbbd1e63fe30124b0646fc90614843ba
 
 pkgname = bubbleupnpserver
-
diff --git a/PKGBUILD b/PKGBUILD
index bc7819e8d00b..6b2103b1cd3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Nick Bair <njbair at gmail dot com>
 
 pkgname=bubbleupnpserver
-pkgver=0.9.38
-pkgrel=3
+pkgver=0.9.41
+pkgrel=1
 pkgdesc="Stream content to Android devices over the Internet, requires UPNP/DNLA backend e.g. miniDLNA, Gerbera, Mediatomb"
 arch=(any)
 url="http://www.bubblesoftapps.com/bubbleupnpserver/"
@@ -15,13 +15,14 @@ optdepends=('ffmpeg: for transcoding')
 install=bubbleupnpserver.install
 # http://www.bubblesoftapps.com/bubbleupnpserver2/docs/changelog.html
 source=(
-        launch.sh
+        bubbleupnpserver.sh
         bubbleupnpserver.service
         bubbleupnpserver.config
         bubbleupnpserver-sysuser.conf
         bubbleupnpserver
-        "https://bubblesoftapps.com/bubbleupnpserver/core/bcprov-jdk16-146.jar"
-        "https://bubblesoftapps.com/bubbleupnpserver/core/BubbleUPnPServerLauncher.jar"
+        #"https://bubblesoftapps.com/bubbleupnpserver/core/bcprov-jdk16-146.jar"
+        #"https://bubblesoftapps.com/bubbleupnpserver/core/BubbleUPnPServerLauncher.jar"
+        "BubbleUPnPServer-distrib-$(date +%F-%H).zip::https://bubblesoftapps.com/bubbleupnpserver/BubbleUPnPServer-distrib.zip"
         "${pkgname}-LICENCE.txt::https://bubblesoftapps.com/bubbleupnpserver/core/LICENCE.txt"
 )
 sha256sums=('7df801995e65a79eb5140814ca80c4caeee7e1282b69acff9e74201cbaafdaf3'
@@ -29,18 +30,17 @@ sha256sums=('7df801995e65a79eb5140814ca80c4caeee7e1282b69acff9e74201cbaafdaf3'
             '61bf63a84b839b85c0fdf0210310c94242bbb6e1aa69bf0d6c46efa013b52ae5'
             'fd764bb4c785ab0e2481d26f4f30656ba756949afa8ed949234e722ded87bf04'
             '105bfe44a43d141457bf87ef89c76a5be57f54cdb3493ae3af99c8ad6a938c36'
-            'd0ae14598f9c528d2ab7bb8ed00e785a5440f692712cd362d69328aba25efb57'
-            '75f31ca14d65f0e077283d15e5715636ea74c7faa0e200c5dd34e6ca50b9a06c'
-            '69420fd34964ad7404efd9f19fad969f608660af85850fb90d343f2fc6eb9b48')
+            'e777c802464c48b711b01ae180b0948df8a3ac15f422007cec21a2a17d53d833'
+            'ceb8ba5042568cd04e7c47f4e4416278bbbd1e63fe30124b0646fc90614843ba')
 backup=("etc/conf.d/bubbleupnpserver.config" "var/lib/bubbleupnp/configuration.xml")
 
 package() {
 
   install -d "${pkgdir}"/var/lib/bubbleupnp
 
-  install -D -m644 "${srcdir}"/bcprov-jdk16-146.jar           "${pkgdir}/usr/share/${pkgname}/bcprov-jdk16-146.jar"
-  install -D -m644 "${srcdir}"/BubbleUPnPServerLauncher.jar   "${pkgdir}/usr/share/${pkgname}/BubbleUPnPServerLauncher.jar"
-  install -D -m755 "${srcdir}"/launch.sh                      "${pkgdir}/usr/share/${pkgname}/launch.sh"
+  install -D -m644 bcprov-jdk16-146.jar          -t "${pkgdir}/usr/share/${pkgname}/"
+  install -D -m644 BubbleUPnPServerLauncher.jar  -t "${pkgdir}/usr/share/${pkgname}/"
+  install -D -m755 "${srcdir}"/bubbleupnpserver.sh            "${pkgdir}/usr/share/${pkgname}/launch.sh"
   install -D -m644 "${srcdir}"/bubbleupnpserver.service       "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
   install -D -m644 "${srcdir}"/bubbleupnpserver.config        "${pkgdir}/etc/conf.d/bubbleupnpserver.config"
   install -D -m644 "${srcdir}"/bubbleupnpserver-sysuser.conf  "${pkgdir}/usr/lib/sysusers.d/bubbleupnpserver.conf"
diff --git a/launch.sh b/bubbleupnpserver.sh
index bc548fdf4b93..bc548fdf4b93 100644
--- a/launch.sh
+++ b/bubbleupnpserver.sh