Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire-2.x

[people/stevee/ipfire-2.x.git] / lfs / mympd

diff --git a/lfs/mympd b/lfs/mympd
index ffedcdcce12ac4cd12c916ceab70ab17982860fc..bb7215ba1bc747d54eb08ed6524587b9b6900029 100644 (file)
--- a/lfs/mympd
+++ b/lfs/mympd
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Webfrontend for Music Player Daemon
 
-VER        = 13.0.6
+VER        = 14.1.0
 
 THISAPP    = myMPD-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,10 +34,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mympd
-PAK_VER    = 1
+PAK_VER    = 4
 
-# TODO move mpd initskript and config to mpd package to run without mpfire
-DEPS       = mpd libmpdclient mpfire
+DEPS       = mpd libmpdclient
 
 SERVICES   = mympd
 
@@ -49,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 2ecd8d42b9398e85fc6c149c9e55f760f2039434039d558ac1914b447858a59676ed9300bc89b2a25757b8d9828dec5934376d4587f6b84026d07adbfd2e4a33
+$(DL_FILE)_BLAKE2 = 621ecc2b9ecf78c606005120837480b1bccc92fd3b9c201781e719ea524fc689b58f587f59fd388b73a0a1e63befce951e9182ee865e625f83a175a61572759b
 
 install : $(TARGET)
 
@@ -82,6 +81,10 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       # Do not try to re-define _FORTIFY_SOURCE
+       cd $(DIR_APP) && sed -e "/D_FORTIFY_SOURCE/d" -i CMakeLists.txt
+
        cd $(DIR_APP) && mkdir -p build
        cd $(DIR_APP)/build && cmake -Wno-dev \
                -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..