Add media assets; clean up PKGBUILD syntax

3 files changed, 75 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b1bdac6f353..3ad4ae6a632d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ardour-git
 	pkgdesc = A multichannel hard disk recorder and digital audio workstation (git version)
-	pkgver = 7.4.r267.g6319980746
+	pkgver = 7.4.r288.gebcaffd19f
 	pkgrel = 1
 	url = https://ardour.org/
 	arch = x86_64
@@ -62,10 +62,16 @@ pkgbase = ardour-git
 	optdepends = non-session-manager: for session management
 	optdepends = xjadeo: video monitoring
 	provides = ardour
+	provides = ladspa-host
+	provides = lv2-host
+	provides = vst-host
+	provides = vst3-host
 	conflicts = ardour
 	source = ardour::git+https://github.com/Ardour/ardour.git
+	source = ardour-midi-7.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
 	source = ardour-7.x-vendor_qm-dsp.patch
 	sha256sums = SKIP
+	sha256sums = a00de00671cdc329b2ca35c2a5c4150af3d6588147f9dca2e3dea752aa2e234c
 	sha256sums = 6393d52d2c084e03ba24f657352a76a58d5e9f530cfeecb87babf8990c902cbc
 
 pkgname = ardour-git
diff --git a/.gitignore b/.gitignore
index b79ce49d342f..32185f7807d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 pkg/
 src/
 ardour/
-ardour-git-*.pkg.tar.xz
-ardour-git-*.pkg.tar.zst
+ardour-git-*.pkg.tar.*
+ardour-midi-*.zip
diff --git a/PKGBUILD b/PKGBUILD
index ae8a5167e932..b7833ac23c8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,46 @@
 # Contributor: SpepS <dreamspepser at yahoo.it>
 # Contributor: Bernardo Barros <bernardobarros at gmail.com>
 # Contributor: Uli Armbruster <uli_armbruster at web.de>
+# Contributor: Albert Gräf <aggraef -at- gmail -dot- com>
 
-pkgname=ardour-git
-pkgver=7.4.r267.g6319980746
+_pkgname=ardour
+pkgname=$_pkgname-git
+pkgver=7.4.r288.gebcaffd19f
 pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation (git version)"
-arch=('x86_64')
-url="https://ardour.org/"
-license=('GPL2')
-groups=('pro-audio')
-depends=('atkmm' 'cairo' 'cairomm' 'fontconfig' 'gdk-pixbuf2' 'gcc-libs'
-         'glibc' 'glibmm' 'gtkmm' 'libx11' 'libxml2' 'pangomm' 'soundtouch'
-         'taglib')
-makedepends=('atk' 'aubio' 'boost' 'cppunit' 'curl' 'dbus' 'doxygen' 'fftw'
-             'flac' 'fluidsynth' 'freetype2' 'git' 'glib2' 'graphviz' 'gtk2'
-             'harfbuzz' 'itstool' 'libarchive' 'liblo' 'liblrdf' 'libltc'
-             'libogg' 'libpulse' 'libsamplerate' 'libsndfile' 'libusb'
-             'libwebsockets' 'lilv' 'lv2' 'pango' 'readline' 'rubberband'
-             'serd' 'sord' 'sratom' 'suil' 'vamp-plugin-sdk')
+pkgdesc='A multichannel hard disk recorder and digital audio workstation (git version)'
+arch=(x86_64)
+url='https://ardour.org/'
+license=(GPL2)
+groups=(pro-audio)
+depends=(atkmm cairo cairomm fontconfig gdk-pixbuf2 gcc-libs
+         glibc glibmm gtkmm libx11 libxml2 pangomm soundtouch
+         taglib)
+makedepends=(atk aubio boost cppunit curl dbus doxygen fftw
+             flac fluidsynth freetype2 git glib2 graphviz gtk2
+             harfbuzz itstool libarchive liblo liblrdf libltc
+             libogg libpulse libsamplerate libsndfile libusb
+             libwebsockets lilv lv2 pango readline rubberband
+             serd sord sratom suil vamp-plugin-sdk)
 optdepends=('harvid: video timeline'
             'libwebsockets: WebSockets control support'
             'non-session-manager: for session management'
             'xjadeo: video monitoring')
-provides=('ardour')
-conflicts=('ardour')
-source=("${pkgname%-*}::git+https://github.com/Ardour/ardour.git"
+provides=($_pkgname ladspa-host lv2-host vst-host vst3-host)
+conflicts=($_pkgname)
+source=("$_pkgname::git+https://github.com/Ardour/ardour.git"
+        "$_pkgname-midi-${pkgver%%.*}.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip"
         'ardour-7.x-vendor_qm-dsp.patch')
 sha256sums=('SKIP'
+            'a00de00671cdc329b2ca35c2a5c4150af3d6588147f9dca2e3dea752aa2e234c'
             '6393d52d2c084e03ba24f657352a76a58d5e9f530cfeecb87babf8990c902cbc')
 
 pkgver() {
-  cd "${srcdir}/${pkgname%-*}"
+  cd $_pkgname
   git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${srcdir}/${pkgname%-*}"
+  cd $_pkgname
 
   # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
   patch -Np1 -r - -i "$srcdir"/ardour-7.x-vendor_qm-dsp.patch
@@ -49,7 +53,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname%-*}"
+  cd $_pkgname
 
   python waf configure \
     --prefix=/usr \
@@ -67,44 +71,59 @@ build() {
 }
 
 package() {
-  depends+=('libFLAC.so' 'libasound.so' 'libatk-1.0.so' 'libaubio.so'
-            'libarchive.so' 'libcurl.so' 'libdbus-1.so' 'libfftw3f.so'
-            'libfftw3f_threads.so' 'libfluidsynth.so' 'libfreetype.so'
-            'libgdk-x11-2.0.so' 'libgio-2.0.so' 'libglib-2.0.so'
-            'libgobject-2.0.so' 'libgtk-x11-2.0.so' 'libharfbuzz.so'
-            'liblo.so' 'liblilv-0.so' 'liblrdf.so' 'libltc.so' 'libogg.so'
-            'libpango-1.0.so' 'libpangocairo-1.0.so' 'libpangoft2-1.0.so'
-            'libpulse.so' 'libreadline.so' 'librubberband.so'
-            'libsamplerate.so' 'libserd-0.so' 'libsndfile.so' 'libsord-0.so'
-            'libsratom-0.so' 'libsuil-0.so' 'libusb-1.0.so'
-            'libvamp-hostsdk.so' 'libvamp-sdk.so')
-
-  cd "${srcdir}/${pkgname%-*}"
-
-  python waf --destdir="${pkgdir}" i18n
-  python waf --destdir="${pkgdir}" install
+  depends+=(libFLAC.so libasound.so libatk-1.0.so libaubio.so
+            libarchive.so libcurl.so libdbus-1.so libfftw3f.so
+            libfftw3f_threads.so libfluidsynth.so libfreetype.so
+            libgdk-x11-2.0.so libgio-2.0.so libglib-2.0.so
+            libgobject-2.0.so libgtk-x11-2.0.so libharfbuzz.so
+            liblo.so liblilv-0.so liblrdf.so libltc.so libogg.so
+            libpango-1.0.so libpangocairo-1.0.so libpangoft2-1.0.so
+            libpulse.so libreadline.so librubberband.so
+            libsamplerate.so libserd-0.so libsndfile.so libsord-0.so
+            libsratom-0.so libsuil-0.so libusb-1.0.so
+            libvamp-hostsdk.so libvamp-sdk.so)
+
+  cd $_pkgname
+
+  python waf --destdir="$pkgdir" i18n
+  python waf --destdir="$pkgdir" install
 
   # Install XDG integration
   # File types
-  install -vDm 644 "build/gtk2_${pkgname%-*}/${pkgname%-*}.xml" \
-    -t "${pkgdir}/usr/share/mime/packages/"
+  install -vDm 644 "build/gtk2_$_pkgname/$_pkgname.xml" \
+    -t "$pkgdir"/usr/share/mime/packages/
 
   # application starter desktop file
-  install -vDm644 "build/gtk2_${pkgname%-*}/${pkgname%-*}${pkgver%%.*}.desktop" \
-    "${pkgdir}/usr/share/applications/ardour.desktop"
+  install -vDm644 "build/gtk2_$_pkgname/$_pkgname${pkgver%%.*}.desktop" \
+    "$pkgdir"/usr/share/applications/ardour.desktop
 
   # Icons
   for size in 16 22 32 48; do
-    install -vdm 755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes"
+    install -vdm 755 "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/mimetypes
     ln -sf "/usr/share/ardour${pkgver%%.*}/icons/application-x-ardour_${size}px.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-ardour.png"
+      "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-ardour.png
   done
   for size in 16 22 32 48 256 512; do
-    install -vdm 755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps"
+    install -vdm 755 "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps
     ln -sf "/usr/share/ardour${pkgver%%.*}/resources/Ardour-icon_${size}px.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname%-*}${pkgver%%.*}.png"
+      "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$_pkgname${pkgver%%.*}.png
   done
 
   # Man pages
-  install -vDm 644 "${pkgname%-*}.1"* -t "${pkgdir}/usr/share/man/man1/"
+  install -vDm 644 "$_pkgname.1"* -t "$pkgdir"/usr/share/man/man1/
+
+  # from the official package at https://archlinux.org/packages/extra/x86_64/ardour/
+  # installation of MIDI files is a bit of a horrorshow,
+  # as upstream is not flexible about tarball naming, etc.
+  install -vdm 755 "$pkgdir"/usr/share/$_pkgname${pkgver%%.*}/media
+  unzip "$srcdir"/$_pkgname-midi-${pkgver%%.*}.zip \
+    -d "$pkgdir"/usr/share/$_pkgname${pkgver%%.*}/media
+
+  install -vdm 755 "$pkgdir"/usr/share/licenses/$pkgname
+  ln -s "/usr/share/$_pkgname${pkgver%%.*}/media/MIDI Beats/LICENSE" \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.beats
+  ln -s "/usr/share/$_pkgname${pkgver%%.*}/media/MIDI Chords/LICENSE" \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.chords
+  ln -s "/usr/share/$_pkgname${pkgver%%.*}/media/MIDI Progressions/LICENSE" \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.progressions
 }