Update to v2.4.6

2 files changed, 19 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10417741bb3e..17b2a11d85c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Mar 31 14:21:34 UTC 2017
 pkgbase = trakmeter-lv2
 	pkgdesc = Loudness meter LV2 plugins for correctly setting up tracking and mixing levels
-	pkgver = 2.0.0
-	pkgrel = 2
+	pkgver = 2.4.6
+	pkgrel = 1
 	url = http://www.mzuther.de/en/software/trakmeter/
 	arch = i686
 	arch = x86_64
@@ -13,7 +11,7 @@ pkgbase = trakmeter-lv2
 	makedepends = lv2
 	depends = libxext
 	depends = freetype2
-	source = trakmeter::git://github.com/mzuther/traKmeter.git#branch=v2.0.0-gcc6
+	source = trakmeter::git://github.com/mzuther/traKmeter.git#tag=v2.4.6
 	sha256sums = SKIP
 
 pkgname = trakmeter-lv2
diff --git a/PKGBUILD b/PKGBUILD
index 9c8fd2a6a1e9..b395cda6d23e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,38 @@
 
 _pkgbasename=trakmeter
 pkgname="${_pkgbasename}-lv2"
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
 pkgdesc="Loudness meter LV2 plugins for correctly setting up tracking and mixing levels"
 arch=('i686' 'x86_64')
 url="http://www.mzuther.de/en/software/trakmeter/"
 license=('GPL3')
 depends=('libxext' 'freetype2')
 makedepends=('premake' 'zip' 'lv2')
-source=("${_pkgbasename}::git://github.com/mzuther/traKmeter.git#branch=v2.0.0-gcc6")
+source=("${_pkgbasename}::git://github.com/mzuther/traKmeter.git#tag=v${pkgver}")
 sha256sums=('SKIP')
 
 prepare() {
-  cd "${srcdir}/${_pkgbasename}/Builds"
+  cd "${srcdir}/${_pkgbasename}/libraries"
 
-  # generate build script
-  premake4 --cc=gcc --os=linux gmake
-
-  # extract build dependencies juce, juce/lv2
-  cd ../libraries
-  mv juce/distrho_lv2-*.tar.gz .
-  mv juce/juce_*.zip .
+  # extract build dependencies juce and distrho
   rm -rf juce
   unzip juce_*.zip
   ln -s JUCE-* juce
 
-  tar -xzf distrho_lv2-*.tar.gz
-  cp -r modules/* juce/modules/
+  mv distrho_lv2-*.tar.gz distrho_lv2.tar.gz
+  tar -xzf distrho_lv2.tar.gz
+  cd distrho_lv2-*
+  cp -r modules/* ../juce/modules/
 }
 
 build() {
-  cd "${srcdir}/${_pkgbasename}/Builds"
+  cd "${srcdir}/${_pkgbasename}/Builds/linux/gmake"
 
   if [[ $CARCH = "x86_64" ]]; then
-    make config=release64 "${_pkgbasename}_lv2_stereo" "${_pkgbasename}_lv2_multi"
+    make config=release_x64 "${_pkgbasename}_lv2_stereo" "${_pkgbasename}_lv2_multi"
   else
-    make config=release32 "${_pkgbasename}_lv2_stereo" "${_pkgbasename}_lv2_multi"
+    make config=release_x32 "${_pkgbasename}_lv2_stereo" "${_pkgbasename}_lv2_multi"
   fi
 }
 
@@ -46,17 +42,17 @@ package() {
     _prefix=_x64
   fi
 
-  cd "${srcdir}/${_pkgbasename}/bin/${_pkgbasename}_lv2${_prefix}"
-
   # lv2 plugins
+  cd "${srcdir}/${_pkgbasename}/bin/lv2/${_pkgbasename}_lv2${_prefix}"
   install -d "${pkgdir}/usr/lib/lv2/${_pkgbasename}"
   install -Dm644 manifest.ttl ${_pkgbasename}_{multi,stereo}.ttl -t "${pkgdir}/usr/lib/lv2/${_pkgbasename}"
   install -Dm755 ../${_pkgbasename}_{multi,stereo}_lv2${_prefix}.so -t "${pkgdir}/usr/lib/lv2/${_pkgbasename}"
 
   # resources
+  cd "${srcdir}/${_pkgbasename}"
   install -d "${pkgdir}/usr/lib/lv2/${_pkgbasename}/${_pkgbasename}"
-  cp -Lpr "../${_pkgbasename}/doc" "${pkgdir}/usr/lib/lv2/${_pkgbasename}/${_pkgbasename}"
-  cp -Lpr "../${_pkgbasename}/skins" "${pkgdir}/usr/lib/lv2/${_pkgbasename}/${_pkgbasename}"
+  cp -Lpr "doc" "${pkgdir}/usr/lib/lv2/${_pkgbasename}/${_pkgbasename}"
+  cp -Lpr "skins" "${pkgdir}/usr/lib/lv2/${_pkgbasename}/${_pkgbasename}"
 
   # Create doc link
   install -d "${pkgdir}/usr/share/doc/${pkgname}"