Merge branch 'master' into next

[people/mfischer/ipfire-2.x.git] / lfs / minidlna

diff --git a/lfs/minidlna b/lfs/minidlna
index 3302cdd5c5fd8316e78be9bb646b959ffc0c6ea5..490ff72f5ac2c5157bed432f57d249cf8dcff111 100644 (file)
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2021  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        = 1.1.3
+SUMMARY    = DLNA compatible server
+
+VER        = 1.3.0
 
 THISAPP    = minidlna-$(VER)
 DL_FILE    = minidlna-$(VER).tar.gz
@@ -32,9 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 4
+PAK_VER    = 8
+
+DEPS       = ffmpeg flac libexif libid3tag libogg
 
-DEPS       = "ffmpeg flac libexif libid3tag libogg"
+SERVICES   = minidlna
+
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 879027192c89e5376cdd2ae2d1aa33b4
+$(DL_FILE)_MD5 = 89e92d1938ee3066631d4ca9fbf31507
 
 install : $(TARGET)
 
@@ -54,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -77,6 +83,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
@@ -85,7 +92,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc
 
        #install initscripts
-       $(call INSTALL_INITSCRIPT,minidlna)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
+
+       #install backup definition
+       install -v -m 644 ${DIR_SRC}/config/backup/includes/minidlna \
+                       /var/ipfire/backup/addons/includes/minidlna
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)