git » ardour.git » commit 3e5e6c6

diff --git a/PKGBUILD b/PKGBUILD
index 456a5d2..a9dfc16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,88 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=ardour
-pkgver=7.3
-_commit=9978475698d3aac61f35b0e3ba834b802168c7b8  # refs/tags/7.3
+pkgver=7.4
+_commit=5e967c02a9cfc2fffadc9d0edca294ff193481fd  # refs/tags/7.4^{}
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=(x86_64)
 url="https://ardour.org/"
-license=(custom:CC0 GPL2 MIT)
+license=(
+  custom:CC0
+  GPL2
+  MIT
+)
 groups=(pro-audio)
-depends=(cairo gcc-libs glibc gtkmm libx11 taglib)
-makedepends=(atkmm aubio boost cairomm cppunit curl dbus doxygen fftw flac
-fluidsynth fontconfig freetype2 gdk-pixbuf2 git glib2 glibmm graphviz gtk2
-hidapi itstool jack libarchive liblo liblrdf libltc libogg libpulse
-libsamplerate libsndfile libusb libwebsockets libxml2 lilv lv2 pango pangomm
-readline rubberband serd sord sratom suil unzip vamp-plugin-sdk waf)
+depends=(
+  cairo
+  gcc-libs
+  glibc
+  gtkmm
+  hicolor-icon-theme
+  libsigc++
+  libx11
+  sh
+  taglib
+)
+makedepends=(
+  atkmm
+  aubio
+  boost
+  cairomm
+  cppunit
+  curl
+  dbus
+  doxygen
+  fftw
+  flac
+  fluidsynth
+  fontconfig
+  freetype2
+  gdk-pixbuf2
+  git
+  glib2
+  glibmm
+  graphviz
+  gtk2
+  hidapi
+  itstool
+  jack
+  libarchive
+  liblo
+  liblrdf
+  libltc
+  libogg
+  libpulse
+  libsamplerate
+  libsndfile
+  libusb
+  libwebsockets
+  libxml2
+  lilv
+  lv2
+  pango
+  pangomm
+  readline
+  rubberband
+  serd
+  sord
+  sratom
+  suil
+  unzip
+  vamp-plugin-sdk
+  waf)
 optdepends=(
   'harvid: for video timeline and MP3 export'
   'new-session-manager: for session management'
   'xjadeo: for video monitoring'
 )
-provides=(ladspa-host lv2-host vamp-host vst-host vst3-host)
+provides=(
+  ladspa-host
+  lv2-host
+  vamp-host
+  vst-host
+  vst3-host
+)
 source=(
   $pkgname::git+https://github.com/$pkgname/$pkgname.git#tag=$_commit
   $pkgname-midi-$pkgver.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
@@ -36,6 +98,11 @@ b2sums=('SKIP'
         'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
         '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 prepare() {
   # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
   patch -Np1 -d $pkgname -i ../$pkgname-7.0-re-vendor_qm-dsp.patch
@@ -59,19 +126,23 @@ prepare() {
 }
 
 build() {
+  local waf_configure_options=(
+    --prefix=/usr
+    --configdir=/etc
+    --cxx11
+    --freedesktop
+    --lxvst
+    --nls
+    --no-phone-home
+    --optimize
+    --ptformat
+    --use-external-libs
+    --with-backends="alsa,dummy,jack,pulseaudio"
+  )
+
   cd $pkgname
   export LINKFLAGS="$LDFLAGS"
-  waf configure --prefix=/usr \
-                --configdir=/etc \
-                --cxx11 \
-                --freedesktop \
-                --lxvst \
-                --nls \
-                --no-phone-home \
-                --optimize \
-                --ptformat \
-                --use-external-libs \
-                --with-backends="alsa,dummy,jack,pulseaudio"
+  waf configure "${waf_configure_options[@]}"
   waf build -v
 }
 
@@ -111,10 +182,10 @@ package() {
   )
 
   (
-  cd $pkgname
-  waf i18n --destdir="$pkgdir"
-  waf install --destdir="$pkgdir"
-  install -vDm 644 $pkgname.1 -t "$pkgdir/usr/share/man/man1/"
+    cd $pkgname
+    waf i18n --destdir="$pkgdir"
+    waf install --destdir="$pkgdir"
+    install -vDm 644 $pkgname.1 -t "$pkgdir/usr/share/man/man1/"
   )
 
   # installation of MIDI files is a bit of a horrorshow, as upstream is not flexible about tarball naming, etc.