rbutil-git 1.4.0.r1593.9f6ce046cb-1

3 files changed, 37 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a7b09e73c5e..9cd1fe1a3195 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,32 @@
+# Generated by mksrcinfo v8
+# Tue Jan  2 13:05:09 UTC 2018
 pkgbase = rbutil-git
-	pkgver = 1.4.0.r540.0f61e38
+	pkgver = 1.4.0.r1593.9f6ce046cb
 	pkgrel = 1
 	url = http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility
-	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = gendesk
+	makedepends = crypto++
 	makedepends = git
 	makedepends = libusb
 	makedepends = qt5-base
 	makedepends = qt5-tools
 	makedepends = speex
+	makedepends = speexdsp
 	source = rbutil::git://git.rockbox.org/rockbox
+	source = rbutil.desktop
 	sha256sums = SKIP
+	sha256sums = 6c7e7f8aa3dbbf1ace8cd43dd057649cfd329224e899fb83d739113a8a15be9d
 
 pkgname = rbutil-git
 	pkgdesc = Rockbox Utility
-	depends = libusb
+	depends = gcc-libs
+	depends = glibc
 	depends = qt5-base
 	depends = speex
+	depends = speexdsp
+	depends = zlib
+	depends = libusb-1.0.so
 	optdepends = espeak: TTS engine
 	optdepends = festival: TTS engine
 	optdepends = flite: TTS engine
@@ -28,7 +36,9 @@ pkgname = rbutil-git
 
 pkgname = rbspeex-git
 	pkgdesc = Rockbox Speex Codec
+	depends = glibc
 	depends = speex
+	depends = speexdsp
 	provides = rbspeex
 	conflicts = rbspeex
 
diff --git a/PKGBUILD b/PKGBUILD
index ad742e90c2ef..5efe447220b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,16 @@
 
 pkgbase=rbutil-git
 pkgname=('rbutil-git' 'rbspeex-git')
-pkgver=1.4.0.r540.0f61e38
+pkgver=1.4.0.r1593.9f6ce046cb
 pkgrel=1
 arch=('x86_64')
 url='http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility'
 license=('GPL')
-makedepends=('gendesk' 'git' 'libusb' 'qt5-base' 'qt5-tools' 'speex')
-source=('rbutil::git://git.rockbox.org/rockbox')
-sha256sums=('SKIP')
+makedepends=('crypto++' 'git' 'libusb' 'qt5-base' 'qt5-tools' 'speex' 'speexdsp')
+source=('rbutil::git://git.rockbox.org/rockbox'
+        'rbutil.desktop')
+sha256sums=('SKIP'
+            '6c7e7f8aa3dbbf1ace8cd43dd057649cfd329224e899fb83d739113a8a15be9d')
 
 pkgver() {
   cd rbutil
@@ -20,24 +22,26 @@ pkgver() {
 }
 
 prepare() {
-  gendesk -f -n --pkgname 'rbutil' --pkgdesc "${pkgdesc}" --name='Rockbox Utility' --exec='RockboxUtility' --categories='Application;Utility;' --comment='Rockbox automated installer'
+  sed 's/LIBS += -lz/LIBS += -lz -lcryptopp/' -i rbutil/rbutil/rbutilqt/rbutilqt.pro
 }
 
 build() {
+
   cd rbutil/rbutil/rbutilqt
 
   lrelease-qt5 rbutilqt.pro
   qmake-qt5
   make
 
-  cd ../../tools
+  cd ../../tools/rbspeex
 
-  make -C rbspeex
+  make
 }
 
 package_rbutil-git(){
   pkgdesc='Rockbox Utility'
-  depends=('libusb' 'qt5-base' 'speex')
+  depends=('gcc-libs' 'glibc' 'qt5-base' 'speex' 'speexdsp' 'zlib'
+           'libusb-1.0.so')
   optdepends=('espeak: TTS engine'
               'festival: TTS engine'
               'flite: TTS engine'
@@ -55,7 +59,7 @@ package_rbutil-git(){
 
 package_rbspeex-git(){
   pkgdesc='Rockbox Speex Codec'
-  depends=('speex')
+  depends=('glibc' 'speex' 'speexdsp')
   provides=('rbspeex')
   conflicts=('rbspeex')
 
diff --git a/rbutil.desktop b/rbutil.desktop
new file mode 100644
index 000000000000..e448d3221a37
--- /dev/null
+++ b/rbutil.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Rockbox Utility
+Comment=Rockbox automated installer
+Exec=RockboxUtility
+Icon=rbutil
+Terminal=false
+StartupNotify=false
+Categories=Application;Utility;;