From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:38:10 +0000 (+0000)
Subject: mpdas: merge r27709, r27710, r28969
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee5ade2b9370eaeb9dd0f2d48a9ecf46be8b6f5d;p=openwrt%2Fsvn-archive%2Fpackages.git

mpdas: merge r27709, r27710, r28969

SVN-Revision: 30284
---

diff --git a/sound/mpdas/Makefile b/sound/mpdas/Makefile
index 2550ceb63..b0b1f1f2a 100644
--- a/sound/mpdas/Makefile
+++ b/sound/mpdas/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpdas
 PKG_VERSION:=0.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://50hz.ws/mpdas
@@ -28,7 +28,7 @@ endef
 
 define Package/mpdas/description
     mpdas is an AudioScrobbler client for MPD written in C++.
-    It supports the latest AudioScrobbler protocol (1.21).
+    It supports the latest AudioScrobbler protocol (2.0).
     In case of a downtime or connectivity problems, mpdas will 
     cache the played songs to ~/.mpdascache.
 endef
diff --git a/sound/mpdas/files/mpdas.init b/sound/mpdas/files/mpdas.init
index 4b8eeb666..ba64d9519 100644
--- a/sound/mpdas/files/mpdas.init
+++ b/sound/mpdas/files/mpdas.init
@@ -1,11 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
+
 START=94
 
+SERVICE_DAEMONIZE=1
+
 start() {
-	HOME=/root /usr/bin/mpdas -c /etc/mpdasrc &
+	HOME=/root \
+	service_start /usr/bin/mpdas -c /etc/mpdasrc
 }
 
 stop() {
-	killall mpdas
+	service_stop /usr/bin/mpdas
 }
diff --git a/sound/mpdas/patches/001-flags.patch b/sound/mpdas/patches/001-flags.patch
index f136683dd..11a6a6d72 100644
--- a/sound/mpdas/patches/001-flags.patch
+++ b/sound/mpdas/patches/001-flags.patch
@@ -1,12 +1,19 @@
---- a/Makefile
-+++ b/Makefile
-@@ -7,8 +7,8 @@ PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/man/man1
- CONFIG = $(PREFIX)/etc
+Index: mpdas-0.3.0/Makefile
+===================================================================
+--- mpdas-0.3.0.orig/Makefile	2010-11-22 02:15:12.000000000 +0100
++++ mpdas-0.3.0/Makefile	2011-07-20 16:53:31.000000000 +0200
+@@ -3,12 +3,12 @@
+ CXX	?= g++
+ OBJ	= main.o md5.o utils.o mpd.o audioscrobbler.o cache.o config.o
+ OUT	= mpdas
+-PREFIX ?= /usr/local
++PREFIX ?= /
+ MANPREFIX ?= ${PREFIX}/man/man1
+ CONFIG ?= $(PREFIX)/etc
  
 -CXXFLAGS	+= `pkg-config --cflags libmpd libcurl` 
 -LIBS		= `pkg-config --libs libmpd libcurl`
-+CXXFLAGS	+= $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` 
++CXXFLAGS	+= $(CPPFLAGS) `pkg-config --cflags libmpd libcurl`
 +LIBS		= $(LDFLAGS) `pkg-config --libs libmpd libcurl`
  
  CXXFLAGS	+= -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\""