From 63b7d95e8062ee9a231ce39d78b8cf714dc31a38 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 8 Jan 2026 16:46:51 -0500
Subject: [PATCH] shairport-sync: use recipe from meta-dimonoff

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
---
 .../{files => shairport-sync}/mpc-stop.sh     |  0
 .../shairport-sync.conf.in                    |  0
 .../shairport-sync/shairport-sync_%.bbappend  | 22 +++++++
 .../shairport-sync/shairport-sync_git.bb      | 59 -------------------
 4 files changed, 22 insertions(+), 59 deletions(-)
 rename recipes-multimedia/shairport-sync/{files => shairport-sync}/mpc-stop.sh (100%)
 rename recipes-multimedia/shairport-sync/{files => shairport-sync}/shairport-sync.conf.in (100%)
 create mode 100644 recipes-multimedia/shairport-sync/shairport-sync_%.bbappend
 delete mode 100644 recipes-multimedia/shairport-sync/shairport-sync_git.bb

diff --git a/recipes-multimedia/shairport-sync/files/mpc-stop.sh b/recipes-multimedia/shairport-sync/shairport-sync/mpc-stop.sh
similarity index 100%
rename from recipes-multimedia/shairport-sync/files/mpc-stop.sh
rename to recipes-multimedia/shairport-sync/shairport-sync/mpc-stop.sh
diff --git a/recipes-multimedia/shairport-sync/files/shairport-sync.conf.in b/recipes-multimedia/shairport-sync/shairport-sync/shairport-sync.conf.in
similarity index 100%
rename from recipes-multimedia/shairport-sync/files/shairport-sync.conf.in
rename to recipes-multimedia/shairport-sync/shairport-sync/shairport-sync.conf.in
diff --git a/recipes-multimedia/shairport-sync/shairport-sync_%.bbappend b/recipes-multimedia/shairport-sync/shairport-sync_%.bbappend
new file mode 100644
index 0000000..c5444e6
--- /dev/null
+++ b/recipes-multimedia/shairport-sync/shairport-sync_%.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://shairport-sync.conf.in \
+    file://mpc-stop.sh \
+"
+
+AIRPLAY_SERVER_NAME ?= "%h shairplay-sync"
+
+do_install:append() {
+    sed -e "s/@AIRPLAY_SERVER_NAME@/${AIRPLAY_SERVER_NAME}/" \
+        ${UNPACKDIR}/shairport-sync.conf.in > ${UNPACKDIR}/shairport-sync.conf
+    install -d ${D}${sysconfdir}/
+    install -m 0644 ${UNPACKDIR}/shairport-sync.conf ${D}${sysconfdir}/
+
+    # Modify shairport-sync start arguments to always stop MPD before playing:
+    sed -i -e "s@^\(ExecStart=.*\)@\1 -w --on-start=${bindir}/mpc-stop.sh@g" \
+        ${D}${systemd_system_unitdir}/shairport-sync.service
+
+    install -d ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/mpc-stop.sh ${D}${bindir}
+}
diff --git a/recipes-multimedia/shairport-sync/shairport-sync_git.bb b/recipes-multimedia/shairport-sync/shairport-sync_git.bb
deleted file mode 100644
index d4f9677..0000000
--- a/recipes-multimedia/shairport-sync/shairport-sync_git.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "AirPlay audio player. Shairport Sync adds multi-room capability with Audio Synchronisation"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSES;md5=9f329b7b34fcd334fb1f8e2eb03d33ff"
-
-DEPENDS = " libconfig popt avahi openssl alsa-lib"
-
-PV = "4.3.7"
-SRCBRANCH = "master"
-SRCREV = "3c8ceb7c97c8782903ec48e280023436711e0913"
-SRC_URI = "git://github.com/mikebrady/shairport-sync;protocol=https;branch=${SRCBRANCH}"
-
-SRC_URI += " \
-    file://shairport-sync.conf.in \
-    file://mpc-stop.sh \
-"
-
-inherit autotools pkgconfig systemd useradd
-
-EXTRA_OECONF = " \
-    --with-alsa \
-    --with-stdout \
-    --with-ssl=openssl \
-    --with-avahi \
-    --with-metadata \
-    --with-libdaemon \
-    --with-systemd \
-    --without-create-user-group \
-"
-
-AIRPLAY_SERVER_NAME ?= "%h shairplay-sync"
-
-do_install:append() {
-    sed -e "s/@AIRPLAY_SERVER_NAME@/${AIRPLAY_SERVER_NAME}/" \
-        ${UNPACKDIR}/shairport-sync.conf.in > ${UNPACKDIR}/shairport-sync.conf
-    install -d ${D}${sysconfdir}/
-    install -m 0644 ${UNPACKDIR}/shairport-sync.conf ${D}${sysconfdir}/
-
-    # Modify shairport-sync start arguments to always stop MPD before playing:
-    sed -i -e "s@^\(ExecStart=.*\)@\1 -w --on-start=${bindir}/mpc-stop.sh@g" \
-        ${D}${systemd_system_unitdir}/shairport-sync.service
-
-    install -d ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/mpc-stop.sh ${D}${bindir}
-}
-
-SYSTEMD_SERVICE:${PN} = " \
-     shairport-sync.service \
-"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = " \
-    --system \
-    --no-create-home \
-    --home ${runstatedir}/shairport-sync \
-    --groups audio \
-    --user-group shairport-sync \
-"
-
-RDEPENDS:${PN} = "avahi-daemon"
-- 
2.20.1