From b84fe58dbd1eb6e1c322c068ad40aebf48cc5640 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 6 Mar 2024 23:04:10 -0500
Subject: [PATCH] shairport-sync: remove patch to disable user/group creation

Use new configure option to disable user/group creation.
---
 ...01-yocto-disable-user-group-creation.patch | 34 -------------------
 .../shairport-sync/shairport-sync_git.bb      |  2 +-
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 recipes-multimedia/shairport-sync/files/0001-yocto-disable-user-group-creation.patch

diff --git a/recipes-multimedia/shairport-sync/files/0001-yocto-disable-user-group-creation.patch b/recipes-multimedia/shairport-sync/files/0001-yocto-disable-user-group-creation.patch
deleted file mode 100644
index 6e35a92..0000000
--- a/recipes-multimedia/shairport-sync/files/0001-yocto-disable-user-group-creation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e339921792ce7b92d4563a5dd0c675a1bb06e953 Mon Sep 17 00:00:00 2001
-From: Hugo Villeneuve <hugo@hugovil.com>
-Date: Mon, 19 Feb 2024 12:20:43 -0500
-Subject: [PATCH] yocto: disable user/group creation
-
----
- Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d9cfbf6e..c1765489 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,7 @@ INSTALL_SYSTEMV_TARGET = install-systemv-local
- # will be stored in a scripts folder in the _build_ folder
- # which will be the source folder if you're not using a separate build folder
- 
--$(INSTALL_SYSTEMV_TARGET): scripts/shairport-sync $(INSTALL_USER_TARGET)
-+$(INSTALL_SYSTEMV_TARGET): scripts/shairport-sync
- 	install -d $(DESTDIR)$(sysconfdir)/init.d
- 	[ -e $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || install -m 0755 scripts/shairport-sync $(DESTDIR)$(sysconfdir)/init.d
- 
-@@ -297,7 +297,7 @@ INSTALL_SYSTEMD_TARGET = install-systemd-local
- # will be stored in a scripts folder in the _build_ folder
- # which will be the source folder if you're not using a separate build folder
- 
--$(INSTALL_SYSTEMD_TARGET): scripts/$(SYSTEMD_SERVICE) $(INSTALL_USER_TARGET)
-+$(INSTALL_SYSTEMD_TARGET): scripts/$(SYSTEMD_SERVICE)
- 	install -d $(DESTDIR)$(systemdsystemunitdir)
- 	[ -e $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || install -m 0644 scripts/$(SYSTEMD_SERVICE) $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service
- 
--- 
-2.39.2
-
diff --git a/recipes-multimedia/shairport-sync/shairport-sync_git.bb b/recipes-multimedia/shairport-sync/shairport-sync_git.bb
index 489db44..78f951e 100644
--- a/recipes-multimedia/shairport-sync/shairport-sync_git.bb
+++ b/recipes-multimedia/shairport-sync/shairport-sync_git.bb
@@ -7,7 +7,6 @@ SRCREV = "${AUTOREV}"
 SRC_URI = "git://github.com/hvilleneuve29/shairport-sync;protocol=https;branch=${SRCBRANCH}"
 
 SRC_URI += " \
-    file://0001-yocto-disable-user-group-creation.patch \
     file://shairport-sync.conf.in \
     file://mpc-stop.sh \
 "
@@ -22,6 +21,7 @@ EXTRA_OECONF = " \
     --with-metadata \
     --with-libdaemon \
     --with-systemd \
+    --without-create-user-group \
 "
 
 DEPENDS = " libconfig popt avahi openssl alsa-lib"
-- 
2.20.1