From e128013289dc5b57249187b4efc7e14a5a27d5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Sun, 15 Jun 2014 19:36:35 +0200
Subject: [PATCH] dump1090: Switch to MalcolmRobb's repo, add myself as
 maintainer, fix html files and add package configuration.

---
 utils/dump1090/Config.in                  | 20 ++++++++++++++++++++
 utils/dump1090/Makefile                   | 23 ++++++++++++++++-------
 utils/dump1090/patches/100-html_dir.patch | 11 +++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 utils/dump1090/Config.in
 create mode 100644 utils/dump1090/patches/100-html_dir.patch

diff --git a/utils/dump1090/Config.in b/utils/dump1090/Config.in
new file mode 100644
index 0000000000..cee0aa5db7
--- /dev/null
+++ b/utils/dump1090/Config.in
@@ -0,0 +1,20 @@
+config DUMP1090_DUMP
+	bool "dump1090"
+	depends on PACKAGE_dump1090
+	default y
+	help
+		dump1090 ModeS Receiver
+
+config DUMP1090_WWW
+	bool "website files"
+	depends on DUMP1090_DUMP
+	default y
+	help
+		HTML website files for showing planes
+
+config DUMP1090_VIEW
+	bool "view1090"
+	depends on PACKAGE_dump1090
+	default n
+	help
+		view1090 dump1090 Viewer
diff --git a/utils/dump1090/Makefile b/utils/dump1090/Makefile
index 3289f2bf6a..f260163547 100644
--- a/utils/dump1090/Makefile
+++ b/utils/dump1090/Makefile
@@ -7,19 +7,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dump1090
-PKG_VERSION:=2013-02-04
+PKG_VERSION:=2014-06-15
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/antirez/dump1090.git
+PKG_SOURCE_URL:=git://github.com/MalcolmRobb/dump1090.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ff0fe38722c768c7269afa733790a2b968ea3099
+PKG_SOURCE_VERSION:=6afdc9bd1b0462a1606a5539d44cd33c57b44f84
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=BSD-3c
 
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dump1090
@@ -30,6 +29,9 @@ define Package/dump1090
   DEPENDS:=+libpthread +librtlsdr
 endef
 
+define Package/dump1090/config
+	source "$(SOURCE)/Config.in"
+endef
 
 define Package/dump1090/description
  Dump1090 is a Mode S decoder specifically designed for RTLSDR devices.
@@ -42,10 +44,17 @@ MAKE_FLAGS += \
 
 define Package/dump1090/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
 
+ifneq ($(CONFIG_DUMP1090_DUMP),)
+	$(CP) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
+ifneq ($(CONFIG_DUMP1090_WWW),)
 	$(INSTALL_DIR) $(1)/usr/share/dump1090
-	$(CP) $(PKG_BUILD_DIR)/gmap.html $(1)/usr/share/dump1090
+	$(CP) $(PKG_BUILD_DIR)/public_html/* $(1)/usr/share/dump1090
+endif
+endif
+ifneq ($(CONFIG_DUMP1090_VIEW),)
+	$(CP) $(PKG_BUILD_DIR)/view1090 $(1)/usr/bin
+endif
 endef
 
 $(eval $(call BuildPackage,dump1090))
diff --git a/utils/dump1090/patches/100-html_dir.patch b/utils/dump1090/patches/100-html_dir.patch
new file mode 100644
index 0000000000..8976057f73
--- /dev/null
+++ b/utils/dump1090/patches/100-html_dir.patch
@@ -0,0 +1,11 @@
+--- a/dump1090.h
++++ b/dump1090.h
+@@ -178,7 +178,7 @@
+ #define MODES_NET_SNDBUF_MAX  (7)               
+ 
+ #ifndef HTMLPATH
+-#define HTMLPATH   "./public_html"      // default path for gmap.html etc
++#define HTMLPATH   "/usr/share/dump1090"      // default path for gmap.html etc
+ #endif
+ 
+ #define MODES_NOTUSED(V) ((void) V)