update to 1.2.0-rc5 and switched to QT5

2 files changed, 32 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4bc5d0501d7e..32bc900dadd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = lmms-beta
 	pkgdesc = Beta version of the Linux MultiMedia Studio.
-	pkgver = 1.2.0_rc4
-	pkgrel = 4
+	pkgver = 1.2.0_rc5
+	pkgrel = 1
 	url = https://lmms.io/
 	arch = x86_64
 	license = GPL
+	makedepends = git
 	makedepends = cmake
 	makedepends = ladspa
 	makedepends = libxft
@@ -20,6 +21,8 @@ pkgbase = lmms-beta
 	depends = libxft
 	depends = libxinerama
 	depends = qt4
+	depends = qt5-base
+	depends = qt5-x11extras
 	depends = sdl_sound
 	depends = libsamplerate
 	depends = shared-mime-info
@@ -28,13 +31,12 @@ pkgbase = lmms-beta
 	optdepends = fftw: SpectrumAnalyzer plugin
 	optdepends = stk: STK instruments plugins
 	optdepends = pulseaudio: PulseAudio output
+	optdepends = libgig: needed for decoding .gig files
 	provides = lmms
 	provides = lmms-extras
 	conflicts = lmms
 	conflicts = lmms-extras
 	options = !makeflags
-	source = https://github.com/LMMS/lmms/archive/v1.2.0-rc4.tar.gz
-	md5sums = cd2d77dfe750b6e42de1ca68543aa7fe
 	makedepends_x86_64 = gcc-multilib
 
 pkgname = lmms-beta
diff --git a/PKGBUILD b/PKGBUILD
index 25d16a74d039..c5bad94c4a54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,55 @@
 
 pkgname=lmms-beta
 _basever=1.2.0
-_rc=rc4
+_rc=rc5
 pkgver=${_basever}_${_rc}
-pkgrel=4
+pkgrel=1
 pkgdesc='Beta version of the Linux MultiMedia Studio.'
 arch=('x86_64')
 url='https://lmms.io/'
 license=('GPL')
-depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt4' 'sdl_sound'
+depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt4' 'qt5-base' 'qt5-x11extras' 'sdl_sound'
          'libsamplerate' 'shared-mime-info' 'fltk')
 optdepends=('wine: VST support (experimental)'
             'fftw: SpectrumAnalyzer plugin'
             'stk: STK instruments plugins'
-            'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine')
+            'pulseaudio: PulseAudio output'
+            'libgig: needed for decoding .gig files')
+makedepends=('git' 'cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine')
 makedepends_x86_64=('gcc-multilib')
 provides=('lmms' 'lmms-extras')
 conflicts=('lmms' 'lmms-extras')
 options=('!makeflags')
-source=("https://github.com/LMMS/lmms/archive/v${_basever}-${_rc}.tar.gz")
-md5sums=('cd2d77dfe750b6e42de1ca68543aa7fe')
+source=()
 
 prepare() {
-  cd "${srcdir}/lmms-${_basever}-${_rc}"
-
+  git clone --recurse-submodules -b v${_basever}-${_rc} https://github.com/lmms/lmms
+  
+  cd "${srcdir}/lmms"
+  
   sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
 }
 
 build() {
-  cd "${srcdir}/lmms-${_basever}-${_rc}"
+  cd "${srcdir}/lmms"
 
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_VST=ON -USE=vst
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_QT5=ON -DWANT_VST=ON -USE=vst
   make -j4
 }
 
 package() {
-  cd "$srcdir/lmms-${_basever}-${_rc}"
+  cd "$srcdir/lmms"
   make DESTDIR="${pkgdir}" install
+  
+  
+  # Temporary packaging fixes:
+  
+  # Delete optional weakjack.so
+  cd "${pkgdir}"
+  rm -r home/
+  
+  # Move lib64 files to lib
+  cd "${pkgdir}/usr"
+  mv lib64/* lib/
+  rm -r lib64/
 }