From 48ca1375d3a00d9b3214f4b37524bd416ca9a785 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 3 May 2014 11:53:20 +0000
Subject: [PATCH] bemused: fix build by including more include files

Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 40675
---
 utils/bemused/Makefile                        |  4 ++--
 .../patches/110-missing_includes.patch        | 19 +++++++++++++++----
 .../patches/200-cxx-compile-fixes.patch       | 18 ++++++------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 61cc1013a..c30c7c345 100644
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2011 OpenWrt.org
+# Copyright (C) 2008-2014 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:=bemused-mpd
 PKG_VERSION:=r062
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526
diff --git a/utils/bemused/patches/110-missing_includes.patch b/utils/bemused/patches/110-missing_includes.patch
index c049e3659..7f14a422e 100644
--- a/utils/bemused/patches/110-missing_includes.patch
+++ b/utils/bemused/patches/110-missing_includes.patch
@@ -1,11 +1,22 @@
-diff -urN bemused-mpd-r062/main.cpp bemused-mpd-r062.new/main.cpp
---- bemused-mpd-r062/main.cpp	2008-02-23 08:01:38.000000000 +0100
-+++ bemused-mpd-r062.new/main.cpp	2010-03-29 13:00:07.000000000 +0200
-@@ -16,6 +16,7 @@
+--- a/main.cpp
++++ b/main.cpp
+@@ -16,6 +16,9 @@
   ***************************************************************************/
  
  #include <stdlib.h>
 +#include <stdio.h>
++#include <getopt.h>
++#include <unistd.h>
  #include <iostream>
  
  #include "BemusedServerDlg.h"
+--- a/BemusedServerDlg.cpp
++++ b/BemusedServerDlg.cpp
+@@ -28,6 +28,7 @@
+ #include <cerrno>
+ #include <csignal>
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
diff --git a/utils/bemused/patches/200-cxx-compile-fixes.patch b/utils/bemused/patches/200-cxx-compile-fixes.patch
index 4a6ef0e1e..607b623b9 100644
--- a/utils/bemused/patches/200-cxx-compile-fixes.patch
+++ b/utils/bemused/patches/200-cxx-compile-fixes.patch
@@ -1,7 +1,5 @@
-Index: bemused-mpd-r062/Makefile
-===================================================================
---- bemused-mpd-r062.orig/Makefile	2008-03-31 09:43:54.000000000 +0200
-+++ bemused-mpd-r062/Makefile	2011-03-06 14:19:07.933096517 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,8 +1,15 @@
 -SHELL = /bin/sh
 +LDLIBS = -lbluetooth -lglib -liconv
@@ -24,10 +22,8 @@ Index: bemused-mpd-r062/Makefile
 +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 +
 +all: bemusedlinuxserver
-Index: bemused-mpd-r062/libmpdclient.h
-===================================================================
---- bemused-mpd-r062.orig/libmpdclient.h	2008-04-28 23:03:52.000000000 +0200
-+++ bemused-mpd-r062/libmpdclient.h	2011-03-06 14:15:34.821307043 +0100
+--- a/libmpdclient.h
++++ b/libmpdclient.h
 @@ -68,11 +68,10 @@
  #define MPD_ACK_ERROR_EXIST			56
  
@@ -55,10 +51,8 @@ Index: bemused-mpd-r062/libmpdclient.h
 +#endif
  
  #endif
-Index: bemused-mpd-r062/mpdctrl.c
-===================================================================
---- bemused-mpd-r062.orig/mpdctrl.c	2008-04-28 23:03:52.000000000 +0200
-+++ bemused-mpd-r062/mpdctrl.c	2011-03-06 14:15:34.821307043 +0100
+--- a/mpdctrl.c
++++ b/mpdctrl.c
 @@ -59,6 +59,9 @@
  
  #define ERROR_DISPLAY 5
-- 
2.30.2