From f96c1900903a8874bedc67e6578076a181b3fb77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 3 Jun 2021 10:35:41 +0200
Subject: [PATCH] ardour6: upgrade 6.6+ -> 6-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 322360f9cb0a1aa9e3881fe0c3bb67d9903d4252)
---
 recipes-musicians/ardour/ardour6_git.bb | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/recipes-musicians/ardour/ardour6_git.bb b/recipes-musicians/ardour/ardour6_git.bb
index 088ddb9..6600ee9 100644
--- a/recipes-musicians/ardour/ardour6_git.bb
+++ b/recipes-musicians/ardour/ardour6_git.bb
@@ -29,13 +29,13 @@ DEPENDS += " \
     hidapi \
 "
 
-inherit waf features_check gtk-icon-cache pkgconfig python3native mime-xdg siteinfo
+inherit waf features_check gtk-icon-cache pkgconfig python3native mime mime-xdg siteinfo
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://github.com/Ardour/ardour.git"
-SRCREV = "80f6f152ee35e4fd2605a556f0cff3603ca3a1e4"
-PV = "6.6+git${SRCPV}"
+SRCREV = "6733a847eeb55b4640a65a8bfebac8c7166521c8"
+PV = "6.7"
 S = "${WORKDIR}/git"
 
 # arch specific override - default (tested) is ARM -> no fpu-optimizations
@@ -69,20 +69,9 @@ do_configure_prepend() {
     ln -sf `which python3` ${B}/python
 }
 
-do_install_append() {
-    # install icons to freedesktop locations
-    for s in 16 22 32 48 256 512; do
-        install -d  ${D}${datadir}/icons/hicolor/${s}x${s}/apps
-        ln -s ../../../../${BPN}/resources/Ardour-icon_${s}px.png \
-            ${D}${datadir}/icons/hicolor/${s}x${s}/apps/${BPN}.png
-    done
-
-    # install .desktop
-    install -d  ${D}${datadir}/applications
-    install -m 0644 ${B}/gtk2_ardour/ardour6.desktop ${D}${datadir}/applications
-}
-
 FILES_${PN}-dev += " \
+    ${datadir}/appdata \
+    ${datadir}/mime \
     ${libdir}/${BPN}/libardour.so \
     ${libdir}/${BPN}/libardouralsautil.so \
     ${libdir}/${BPN}/libaudiographer.so \