Update URL, add wrapper to handle PA, add .desktop, update (opt)deps

3 files changed, 51 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 367c393c6224..b60a36349f2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
+# Generated by mksrcinfo v8
+# Thu Nov 15 14:25:31 UTC 2018
 pkgbase = ultrastardx-git
 	pkgdesc = Free and open source karaoke game. (GIT)
-	pkgver = r141.b14cc1b
+	pkgver = r832.fd788a21
 	pkgrel = 1
-	url = http://ultrastardeluxe.org/
+	url = http://usdx.eu/
 	arch = i686
 	arch = x86_64
 	groups = usdx
 	license = GPL
 	makedepends = git
 	makedepends = fpc
+	makedepends = gendesk
 	depends = ffmpeg2.8
 	depends = lua
 	depends = portaudio
@@ -21,11 +24,19 @@ pkgbase = ultrastardx-git
 	depends = ttf-dejavu
 	depends = ttf-freefont
 	depends = wqy-microhei
-	depends = pcre
+	depends = portmidi
+	depends = pkg-config
+	depends = autoconf
+	depends = automake
+	optdepends = ultrastar-creator: Qt program to generate USDX songs
+	optdepends = ultrastardx-songs: Free songs for USDX
+	optdepends = ultrastardx-utility: Manage USDX songs
 	provides = ultrastardx
 	conflicts = ultrastardx
 	source = git://github.com/UltraStar-Deluxe/USDX.git
+	source = ultrastardx.sh
 	sha256sums = SKIP
+	sha256sums = 031df0e2201f5a568a31c8f500a6a31a4bdebd2c6ca26ca7e38839d30ca199f3
 
 pkgname = ultrastardx-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 78e8a437b40b..74552e901386 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,56 @@
+# Maintainer: Jose Riha <jose1711 at gmail dot com>
+# Contributor: John Faust <contact at yayponies dot eu>
+# Contributor: fhilg
+# Contributor: skunk
+
 pkgname=ultrastardx-git
-pkgver=r141.b14cc1b
+pkgver=r832.fd788a21
 pkgrel=1
 pkgdesc='Free and open source karaoke game. (GIT)'
 arch=('i686' 'x86_64')
-url="http://ultrastardeluxe.org/"
+url="http://usdx.eu/"
 license=('GPL')
-depends=('ffmpeg2.8' 'lua' 'portaudio' 'sdl2' 'sdl2_gfx' 'sdl2_mixer'  'sdl2_net' 'sdl2_ttf' 'sdl2_image' 'ttf-dejavu' 'ttf-freefont' 'wqy-microhei' 'pcre')
-makedepends=('git' 'fpc')
+depends=('ffmpeg2.8' 'lua' 'portaudio' 'sdl2' 'sdl2_gfx' 'sdl2_mixer' 'sdl2_net'
+         'sdl2_ttf' 'sdl2_image' 'ttf-dejavu' 'ttf-freefont' 'wqy-microhei' 'portmidi'
+         'pkg-config' 'autoconf' 'automake')
+makedepends=('git' 'fpc' 'gendesk')
+optdepends=('ultrastar-creator: Qt program to generate USDX songs'
+            'ultrastardx-songs: Free songs for USDX'
+            'ultrastardx-utility: Manage USDX songs')
 #options=('!libtool')
 provides=('ultrastardx')
 conflicts=('ultrastardx')
 groups=('usdx')
-source=(
-	"git://github.com/UltraStar-Deluxe/USDX.git"
-)
-sha256sums=(
-	'SKIP'
+source=("git://github.com/UltraStar-Deluxe/USDX.git"
+        "ultrastardx.sh"
 )
 
+sha256sums=('SKIP'
+            '031df0e2201f5a568a31c8f500a6a31a4bdebd2c6ca26ca7e38839d30ca199f3')
+
 pkgver() {
   cd "${srcdir}/USDX"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-cd "${srcdir}/USDX"
-./autogen.sh
+  cd "${srcdir}/USDX"
+  ./autogen.sh
 }
 
 
 build() {
   cd "${srcdir}/USDX"
-  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" ./configure
+  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" ./configure --prefix=/usr --enable-debug
   make LDFLAGS="-O1 --sort-common --as-needed -z relro"
+  gendesk -f -n --pkgname ultrastardx --name "UltraStar Deluxe" --exec "ultrastardx.sh" --pkgdesc "Karaoke game" --categories 'Games'
 }
 
 package() {
-	cd "${srcdir}/USDX"
-	touch COPYING.txt
-	make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/USDX"
+  touch COPYING.txt
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 "ultrastardx.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm755 "${srcdir}/ultrastardx.sh" "${pkgdir}/usr/bin/ultrastardx.sh"
+  install -Dm644 "${srcdir}/USDX/game/resources/icons/ultrastardx-icon.png" "${pkgdir}/usr/share/pixmaps/ultrastardx.png"
 }
diff --git a/ultrastardx.sh b/ultrastardx.sh
new file mode 100644
index 000000000000..3ba6a27e6f54
--- /dev/null
+++ b/ultrastardx.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# a simple wrapper to stop/start pulseaudio
+# before and after ultrastardx
+pacmd exit
+systemctl --user mask pulseaudio.socket
+/usr/bin/ultrastardx
+systemctl --user unmask pulseaudio.socket
+systemctl --user start pulseaudio