X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fmpd;h=13063e03b802b5c29d1be52e7b5fafe58d7915d6;hp=c1871d8b556246051f68ee2139b01ca40a195d56;hb=HEAD;hpb=77e25390bc04f0de83961f67f1799179763c90de

diff --git a/lfs/mpd b/lfs/mpd
index c1871d8b55..c05d34d8e5 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,9 @@
 
 include Config
 
-VER        = 0.22.6
+SUMMARY    = Music Player Daemon
+
+VER        = 0.23.15
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,10 +34,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 24
-SUP_ARCH   = aarch64 armv6l x86_64 i586
+PAK_VER    = 37
+# SUP_ARCH   = aarch64 x86_64
+
+DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
 
-DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
+SERVICES   = mpd
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
+$(DL_FILE)_BLAKE2 = 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7
 
 install : $(TARGET)
 
@@ -53,13 +57,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -68,8 +72,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -79,26 +83,37 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && meson	--prefix=/usr 		\
-				--sysconfdir=/etc	\
-				--libdir=/usr/lib	\
-				-D ipv6=disabled 	\
-				-D sqlite=disabled	\
-				-D smbclient=disabled	\
-				-D id3tag=enabled	\
-				-D vorbis=enabled	\
-				-D expat=enabled	\
-				-D ffmpeg=enabled	\
-				-D flac=enabled		\
-				-D lame=enabled		\
-				-D upnp=disabled	\
-				-D icu=disabled		\
+	cd $(DIR_APP) && meson setup \
+				--prefix=/usr \
+				--sysconfdir=/etc \
+				--libdir=/usr/lib \
+				-D ipv6=disabled  \
+				-D sqlite=disabled \
+				-D smbclient=disabled \
+				-D id3tag=enabled \
+				-D vorbis=enabled \
+				-D expat=enabled \
+				-D ffmpeg=enabled \
+				-D flac=enabled \
+				-D lame=enabled \
+				-D upnp=disabled \
+				-D icu=disabled \
 				builddir/
 	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
 	cd $(DIR_APP) && ninja -C builddir/ install
 
 	#install initscripts
-	$(call INSTALL_INITSCRIPT,mpd)
+	$(call INSTALL_INITSCRIPTS,$(SERVICES))
+
+	-mkdir -p /var/ipfire/mpd/db
+	touch /var/ipfire/mpd/playlist.m3u
+	install -v -m 664 $(DIR_SRC)/config/mpd/mpd.conf /var/ipfire/mpd/
+	echo "Folder for mpd database" > /var/ipfire/mpd/db/info
+	-mkdir -p /var/mp3
+	echo "Folder for music files" > /var/mp3/info
+	chown root.nobody /var/ipfire/mpd/{mpd.conf,playlist.m3u}
+	chmod 664 /var/ipfire/mpd/playlist.m3u
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/mpd /var/ipfire/backup/addons/includes/mpd
 
 	@rm -rf $(DIR_APP)
 	touch /var/log/mpd.error.log