Sync with community release package

Install mime icons

4 files changed, 208 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8ba43fe0e33..f42932039251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,125 @@
 pkgbase = ardour-git
-	pkgdesc = A multichannel hard disk recorder and digital audio workstation
-	pkgver = 6.0.r15.g3e6295f538
+	pkgdesc = A multichannel hard disk recorder and digital audio workstation (git version)
+	pkgver = 6.3.r55.ga4b1277f85
 	pkgrel = 1
-	url = http://ardour.org/
-	arch = i686
+	url = https://ardour.org/
 	arch = x86_64
 	groups = pro-audio
-	license = GPL
+	license = GPL2
+	makedepends = atk
+	makedepends = aubio
 	makedepends = boost
 	makedepends = cppunit
+	makedepends = curl
 	makedepends = cwiid
+	makedepends = dbus
 	makedepends = doxygen
+	makedepends = fftw
+	makedepends = flac
+	makedepends = fluidsynth
+	makedepends = freetype2
 	makedepends = git
+	makedepends = glib2
 	makedepends = graphviz
+	makedepends = gtk2
+	makedepends = harfbuzz
 	makedepends = itstool
-	makedepends = lv2
+	makedepends = libarchive
+	makedepends = liblo
+	makedepends = liblrdf
+	makedepends = libltc
+	makedepends = libogg
+	makedepends = libpulse
+	makedepends = libsamplerate
+	makedepends = libsndfile
+	makedepends = libusb
 	makedepends = libwebsockets
-	depends = alsa-lib
-	depends = aubio
+	makedepends = lilv
+	makedepends = lv2
+	makedepends = pango
+	makedepends = readline
+	makedepends = rubberband
+	makedepends = serd
+	makedepends = sord
+	makedepends = sratom
+	makedepends = suil
+	makedepends = vamp-plugin-sdk
+	depends = atkmm
+	depends = cairo
+	depends = cairomm
+	depends = fontconfig
+	depends = gdk-pixbuf2
+	depends = gcc-libs
+	depends = glibc
+	depends = glibmm
 	depends = gtkmm
-	depends = libarchive
-	depends = liblo
-	depends = liblrdf
-	depends = lilv
-	depends = python
-	depends = rubberband
-	depends = suil
+	depends = libx11
+	depends = libxml2
+	depends = pangomm
+	depends = soundtouch
 	depends = taglib
 	optdepends = cwiid: Wiimote control support
+	optdepends = harvid: video timeline
 	optdepends = libwebsockets: WebSockets control support
+	optdepends = non-session-manager: for session management
+	optdepends = xjadeo: video monitoring
 	provides = ardour
 	conflicts = ardour
-	source = ardour::git://github.com/Ardour/ardour.git
-	source = ardour.desktop
-	md5sums = SKIP
-	md5sums = 2133510d99892ed2793d9ff02e86b3fd
+	source = ardour::git+https://github.com/Ardour/ardour.git
+	source = ardour-6.2-vendor_qm-dsp.patch
+	sha256sums = SKIP
+	sha256sums = e937d80e05fd2955b537b617793c06df23804406b5af7283821ad654fa646635
 
 pkgname = ardour-git
+	depends = atkmm
+	depends = cairo
+	depends = cairomm
+	depends = fontconfig
+	depends = gdk-pixbuf2
+	depends = gcc-libs
+	depends = glibc
+	depends = glibmm
+	depends = gtkmm
+	depends = libx11
+	depends = libxml2
+	depends = pangomm
+	depends = soundtouch
+	depends = taglib
+	depends = libFLAC.so
+	depends = libasound.so
+	depends = libatk-1.0.so
+	depends = libaubio.so
+	depends = libarchive.so
+	depends = libcurl.so
+	depends = libdbus-1.so
+	depends = libfftw3f.so
+	depends = libfftw3f_threads.so
+	depends = libfluidsynth.so
+	depends = libfreetype.so
+	depends = libgdk-x11-2.0.so
+	depends = libgio-2.0.so
+	depends = libglib-2.0.so
+	depends = libgobject-2.0.so
+	depends = libgtk-x11-2.0.so
+	depends = libharfbuzz.so
+	depends = liblo.so
+	depends = liblilv-0.so
+	depends = liblrdf.so
+	depends = libltc.so
+	depends = libogg.so
+	depends = libpango-1.0.so
+	depends = libpangocairo-1.0.so
+	depends = libpangoft2-1.0.so
+	depends = libpulse.so
+	depends = libreadline.so
+	depends = librubberband.so
+	depends = libsamplerate.so
+	depends = libserd-0.so
+	depends = libsndfile.so
+	depends = libsord-0.so
+	depends = libsratom-0.so
+	depends = libsuil-0.so
+	depends = libusb-1.0.so
+	depends = libvamp-hostsdk.so
+	depends = libvamp-sdk.so
 
diff --git a/PKGBUILD b/PKGBUILD
index a30505c797e2..11afb0f36a81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,25 +6,33 @@
 # Contributor: Christopher Arndt <aur at chrisarndt.de>
 
 pkgname=ardour-git
-pkgver=6.0.r15.g3e6295f538
+pkgver=6.3.r55.ga4b1277f85
 pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
-arch=('i686' 'x86_64')
-url="http://ardour.org/"
-license=('GPL')
+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=('alsa-lib' 'aubio' 'gtkmm' 'libarchive' 'liblo' 'liblrdf' 'lilv'
-         'python' 'rubberband' 'suil' 'taglib')
-makedepends=('boost' 'cppunit' 'cwiid' 'doxygen' 'git' 'graphviz' 'itstool'
-             'lv2' 'libwebsockets')
+depends=('atkmm' 'cairo' 'cairomm' 'fontconfig' 'gdk-pixbuf2' 'gcc-libs'
+         'glibc' 'glibmm' 'gtkmm' 'libx11' 'libxml2' 'pangomm' 'soundtouch'
+         'taglib')
+makedepends=('atk' 'aubio' 'boost' 'cppunit' 'curl' 'cwiid' '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=('cwiid: Wiimote control support'
-            'libwebsockets: WebSockets control support')
+            'harvid: video timeline'
+            'libwebsockets: WebSockets control support'
+            'non-session-manager: for session management'
+            'xjadeo: video monitoring')
 provides=('ardour')
 conflicts=('ardour')
-source=("${pkgname%-*}::git://github.com/Ardour/ardour.git"
-        'ardour.desktop')
-md5sums=('SKIP'
-         '2133510d99892ed2793d9ff02e86b3fd')
+source=("${pkgname%-*}::git+https://github.com/Ardour/ardour.git"
+        'ardour-6.2-vendor_qm-dsp.patch')
+sha256sums=('SKIP'
+            'e937d80e05fd2955b537b617793c06df23804406b5af7283821ad654fa646635')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-*}"
@@ -33,6 +41,13 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname%-*}"
+
+  # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
+  patch -Np1 -i "${srcdir}/ardour-6.2-vendor_qm-dsp.patch"
+
+  #~# Set icon for .adour files
+  #~patch -Np1 -i "${srcdir}/ardour-mime-icon.patch"
+
   # https://bugs.archlinux.org/task/54389
   sed -e '8iexport GTK2_RC_FILES=/dev/null' -i gtk2_ardour/ardour.sh.in
 }
@@ -40,25 +55,57 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname%-*}"
 
-  python waf configure --prefix=/usr \
+  python waf configure  --prefix=/usr \
                         --configdir=/etc \
-                        --with-backends=jack,alsa,dummy \
-                        --libjack=weak \
-                        --optimize \
                         --cxx11 \
                         --freedesktop \
+                        --libjack=weak \
+                        --nls \
+                        --no-phone-home \
+                        --optimize \
                         --ptformat \
-                        --no-phone-home
+                        --use-external-libs \
+                        --with-backends=alsa,dummy,jack,pulseaudio
 
   python waf build $MAKEFLAGS
 }
 
 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
 
+  # XDG integration
+  # File types
+  install -vDm 644 "build/gtk2_${pkgname%-*}/${pkgname%-*}.xml" \
+    -t "${pkgdir}/usr/share/mime/packages/"
   # Install freedesktop.org compatible application starter desktop file
-  install -Dm644 "${srcdir}/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"
+    ln -sf "/usr/share/ardour6/icons/application-x-ardour_${size}px.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"
+    ln -sf "/usr/share/ardour6/resources/Ardour-icon_${size}px.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/"
 }
diff --git a/ardour-6.2-vendor_qm-dsp.patch b/ardour-6.2-vendor_qm-dsp.patch
new file mode 100644
index 000000000000..f8265fd6e484
--- /dev/null
+++ b/ardour-6.2-vendor_qm-dsp.patch
@@ -0,0 +1,37 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index 775098e06b..13f6b9410a 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,17 +23,10 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
+-    if conf.is_defined('USE_EXTERNAL_LIBS'):
+-        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
+-        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+-    else:
+-        conf.load('compiler_cxx')
+-        autowaf.configure(conf)
++    conf.load('compiler_cxx')
++    autowaf.configure(conf)
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''
+diff --git i/wscript w/wscript
+index 1c9bb1ff5d..95d377d8a7 100644
+--- i/wscript
++++ w/wscript
+@@ -1041,8 +1041,6 @@ def configure(conf):
+ 
+     if Options.options.use_external_libs:
+         conf.define('USE_EXTERNAL_LIBS', 1)
+-        conf.env.append_value(
+-            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
+ 
+     if Options.options.boost_include != '':
+         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
diff --git a/ardour.desktop b/ardour.desktop
deleted file mode 100644
index e16d82f78837..000000000000
--- a/ardour.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Ardour
-Comment=Multitrack hard disk recorder
-Exec=ardour6
-Icon=/usr/share/ardour6/icons/application-x-ardour_48px.png
-Terminal=false
-Type=Application
-X-MultipleArgs=false
-Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;