pcr/ums: updated to 7.8.0

4 files changed, 76 insertions, 50 deletions

diff --git a/pcr/ums/PKGBUILD b/pcr/ums/PKGBUILD
index b977cf734..7e17d6c2f 100644
--- a/pcr/ums/PKGBUILD
+++ b/pcr/ums/PKGBUILD
@@ -1,65 +1,58 @@
-# Contributor (Arch)     : Red Squirrel <iam at redsquirrel87 dot com>
-# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Maintainer (AUR): Mitch <mitch at znation dot nl>
+# Contributor (AUR): Red Squirrel <iam at redsquirrel87 dot com>
+# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>
 # Based on PMS PKGBUILD
 
 pkgname=ums
-pkgver=5.1.3
+pkgver=7.8.0
 pkgrel=1
 pkgdesc="Universal Media Server: a DLNA-compliant UPnP Media Server. Build based on Java 8."
 arch=('i686' 'x86_64')
 url="http://www.universalmediaserver.com/"
 license=('GPL2')
-depends=('mplayer' 'ffmpeg' 'mencoder' 'libmediainfo' 'java-runtime')
+depends=('mplayer' 'ffmpeg' 'mencoder' 'libmediainfo' 'java-runtime=8')
 makedepends=("unzip")
-[ "$CARCH" = "i686" ] && \
-optdepends=("vlc: For Internet video/audio")
-[ "$CARCH" = "x86_64" ] && \
-optdepends=("vlc: Internet video/audio support"
-            "dcraw: thumbnails creation support"
-            "lib32-gcc-libs: tsMuxeR support"
-            "lib32-glibc: tsMuxeR support")
-backup=(opt/ums/UMS.conf \
+optdepends_i686=("vlc: For Internet video/audio")
+optdepends_x86_64=("vlc: Internet video/audio support"
+                   "dcraw: thumbnails creation support")
+backup=(opt/ums/UMS.conf
         opt/ums/WEB.conf)
-source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver-Java8.tgz")
-sha1sums=('0ae5b947903bb46e840d763d6dcaeb2fd8f1cfc9')
+#source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver.tgz"
+source=("https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/$pkgver/UMS-$pkgver.tgz"
+        'ums.desktop'
+        'ums.service'
+        'ums.timer')
+sha256sums=('3019dee9282881bd724feddd4a34377abc17b9f246fedd3a9205bcf65c4feacf'
+            '0cdadbabef215b6539e56755147a8f626d9f1fadfb85e2e5b7f7f1b66f1cdef9'
+            '1f6efefa58dde9148396bd9236a6985db0fa27f1c767067b52bfae1832f32284'
+            '7fd36db71f39fde3d515c697101190f979b308d910b3c4210b90422669683ab0')
 
 package() {
-  mkdir -p $pkgdir/opt/ums
-  mkdir $pkgdir/opt/ums/database
-  mkdir -p $pkgdir/usr/bin
-  chmod -R 755 $srcdir/ums-$pkgver/plugins $srcdir/ums-$pkgver/documentation
-  cp -r $srcdir/ums-$pkgver/* $pkgdir/opt/ums/
-  chmod +x $pkgdir/opt/ums/UMS.sh \
-           $pkgdir/opt/ums/linux/tsMuxeR
-  touch $pkgdir/opt/ums/UMS.conf
-  touch $pkgdir/opt/ums/debug.log
-  chgrp users $pkgdir/opt/ums/UMS.conf \
-              $pkgdir/opt/ums/WEB.conf \
-              $pkgdir/opt/ums/debug.log \
-              $pkgdir/opt/ums/database
+  mkdir -p ${pkgdir}/opt/ums
+  mkdir ${pkgdir}/opt/ums/database
+  mkdir -p ${pkgdir}/usr/bin
+  chmod -R 755 ${srcdir}/ums-$pkgver/plugins ${srcdir}/ums-$pkgver/documentation
+  rm -R ${srcdir}/ums-$pkgver/linux/*
+  cp -r ${srcdir}/ums-$pkgver/* ${pkgdir}/opt/ums/
+  ln -s /usr/bin/ffmpeg ${pkgdir}/opt/ums/linux/ffmpeg
+  ln -s /usr/bin/ffmpeg ${pkgdir}/opt/ums/linux/ffmpeg64
+  chmod +x ${pkgdir}/opt/ums/UMS.sh
+  touch ${pkgdir}/opt/ums/UMS.conf
+  touch ${pkgdir}/opt/ums/debug.log
+  chgrp users ${pkgdir}/opt/ums/UMS.conf \
+              ${pkgdir}/opt/ums/WEB.conf \
+              ${pkgdir}/opt/ums/debug.log \
+              ${pkgdir}/opt/ums/database
 
-  chmod g+w $pkgdir/opt/ums/UMS.conf \
-            $pkgdir/opt/ums/WEB.conf \
-            $pkgdir/opt/ums/debug.log \
-            $pkgdir/opt/ums/database 
-
-  unzip -q -u $srcdir/ums-$pkgver/ums.jar -d ums_jar
-  install -d -m 755 $pkgdir/usr/share/pixmaps
-  install -D -m 644 $srcdir/ums_jar/resources/images/logo.png $pkgdir/usr/share/pixmaps/ums.png
-
-  cat > ums.desktop << EoF
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Universal Media Server
-Comment=A DLNA-compliant UPnP Media Server.
-Exec=/opt/ums/UMS.sh
-Icon=ums.png
-Terminal=false
-Type=Application
-Categories=Java;Multimedia;AudioVideo;
-EoF
-
-  install -D -m 644 $srcdir/ums.desktop $pkgdir/usr/share/applications/ums.desktop
+  chmod g+w ${pkgdir}/opt/ums/UMS.conf \
+            ${pkgdir}/opt/ums/WEB.conf \
+            ${pkgdir}/opt/ums/debug.log \
+            ${pkgdir}/opt/ums/database
 
+  unzip -q -u ${srcdir}/ums-$pkgver/ums.jar -x / /*.pom -d ums_jar
+  install -d -m 755 ${pkgdir}/usr/share/pixmaps
+  install -D -m 644 ${srcdir}/ums_jar/resources/images/logo.png ${pkgdir}/usr/share/pixmaps/ums.png
+  install -D -m 644 ${srcdir}/ums.desktop ${pkgdir}/usr/share/applications/ums.desktop
+  install -D -m 644 ${srcdir}/ums.service ${pkgdir}/usr/lib/systemd/system/ums@.service
+  install -D -m 644 ${srcdir}/ums.timer ${pkgdir}/usr/lib/systemd/system/ums@.timer
 }
diff --git a/pcr/ums/ums.desktop b/pcr/ums/ums.desktop
new file mode 100644
index 000000000..afd666f92
--- /dev/null
+++ b/pcr/ums/ums.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Universal Media Server
+Comment=A DLNA-compliant UPnP Media Server.
+Exec=/opt/ums/UMS.sh
+Icon=ums.png
+Terminal=false
+Type=Application
+Categories=Java;Multimedia;AudioVideo;
diff --git a/pcr/ums/ums.service b/pcr/ums/ums.service
new file mode 100644
index 000000000..c0ff29acf
--- /dev/null
+++ b/pcr/ums/ums.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Universal Media Server
+Wants=network.target
+After=syslog.target network-online.target rpcbind.service
+
+[Service]
+#Environment="UMS_MAX_MEMORY=1280M"
+User=%i
+Group=users
+WorkingDirectory=/opt/ums/
+Type=simple
+ExecStart=/opt/ums/UMS.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ums/ums.timer b/pcr/ums/ums.timer
new file mode 100644
index 000000000..673077ad6
--- /dev/null
+++ b/pcr/ums/ums.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Start UMS delayed on boot
+
+[Timer]
+OnBootSec=5min
+
+[Install]
+WantedBy=timers.target