- djmount: rework and fix build

package/djmount/djmount.mk

@@ -9,9 +9,6 @@ DJMOUNT_DIR = djmount-$(DJMOUNT_VERSION)
 DJMOUNT_SOURCE = djmount-$(DJMOUNT_VERSION).tar.gz
 DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VERSION)
 
-$(DL_DIR)/$(DJMOUNT_SOURCE):
-	$(download) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE)
-
 DJMOUNT_DEPENDENCIES = libfuse
 
 DJMOUNT_AUTORECONF = YES
@@ -20,16 +17,19 @@ DJMOUNT_CONF_OPTS = \
 	--with-fuse-prefix=$(TARGET_prefix) \
 	--disable-debug
 
-djmount: $(DJMOUNT_DEPENDENCIES) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
+DJMOUNT_MAKE = \
-	$(REMOVE)/$(PKG_DIR)
+	$(MAKE1)
-	$(UNTAR)/$(PKG_SOURCE)
+
-	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
+define DJMOUNT_TOUCH_CONFIG_RPATH
-	$(CHDIR)/$(PKG_DIR); \
+	touch $(PKG_BUILD_DIR)/libupnp/config.aux/config.rpath
-		touch libupnp/config.aux/config.rpath; \
+endef
-		$(TARGET_CONFIGURE); \
+DJMOUNT_PRE_CONFIGURE_HOOKS += DJMOUNT_TOUCH_CONFIG_RPATH
-		$(MAKE1); \
+
-		$(MAKE1) install DESTDIR=$(TARGET_DIR)
+define DJMOUNT_INSTALL_INIT_SCRIPT
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/djmount.init $(TARGET_sysconfdir)/init.d/djmount
 	$(UPDATE-RC.D) djmount defaults 75 25
-	$(REMOVE)/$(PKG_DIR)
+endef
-	$(call TOUCH)
+DJMOUNT_TARGET_FINALIZE_HOOKS += DJMOUNT_INSTALL_INIT_SCRIPT
+
+djmount: | $(TARGET_DIR)
+	$(call autotools-package)

package/djmount/patches/djmount-fixed-crash.patch → package/djmount/patches/0006-fixed-crash.patch

@@ -12,7 +12,7 @@ diff --git a/djmount/device_list.c b/djmount/device_list.c
 index b3cb08f..b5c2103 100644
 --- a/djmount/device_list.c
 +++ b/djmount/device_list.c
-@@ -426,7 +426,7 @@ AddDevice (const char* deviceId,
+@@ -428,7 +428,7 @@ AddDevice (const char* deviceId,
  		} else {
  			// If SSDP target specified, check that the device
  			// matches it.

package/djmount/patches/djmount-support-seeking-in-large-2gb-files.patch → package/djmount/patches/0008-support-seeking-in-large-2gb-files.patch

@@ -30,7 +30,7 @@ diff --git a/djmount/media_file.c b/djmount/media_file.c
 index 44b4ffe..761f715 100644
 --- a/djmount/media_file.c
 +++ b/djmount/media_file.c
-@@ -284,7 +284,7 @@ MediaFile_GetResSize (const MediaFile* const file)
+@@ -282,7 +282,7 @@ MediaFile_GetResSize (const MediaFile* const file)
  {
  	const char* const str = ixmlElement_getAttribute (file->res, "size");
  	off_t res;

package/djmount/patches/0009-libupnp-1.6.6.patch

@@ -0,0 +1,33 @@
+#
+# Description: Update libupnp API for 1.6.x.
+#   Between libupnp2 and libupnp3 (pupnp 1.4.x and 1.6.x) the function
+#   SetLogFileNames was renamed to UpnpSetLogFileNames.
+# Author: nick@leverton.org
+# Bug-Debian: 581879 
+#
+Index: djmount-0.71/djmount/fuse_main.c
+===================================================================
+--- a/djmount/fuse_main.c
++++ b/djmount/fuse_main.c
+@@ -618,7 +618,7 @@
+ 	}  
+ 	Log_Colorize (true);
+ #if UPNP_HAVE_DEBUG
+-	SetLogFileNames ("/dev/null", "/dev/null");
++	UpnpSetLogFileNames ("/dev/null", "/dev/null");
+ #endif
+ 	
+ 	/*
+@@ -745,10 +745,10 @@
+ 					Log_SetMaxLevel (LOG_ERROR);
+ #if UPNP_HAVE_DEBUG
+ 				} else if (strcmp (s, "upnperr") == 0) {
+-					SetLogFileNames ("/dev/stdout", 
++					UpnpSetLogFileNames ("/dev/stdout",
+ 							 "/dev/null");
+ 				} else if (strcmp (s, "upnpall") == 0) {
+-					SetLogFileNames ("/dev/stdout", 
++					UpnpSetLogFileNames ("/dev/stdout",
+ 							 "/dev/stdout");
+ #endif
+ 				} else {

package/djmount/patches/0010-libupnp-1.6.13.patch

@@ -0,0 +1,18 @@
+#
+# Description: Transition from libupnp3 to libupnp6
+# Bug-Debian: http://bugs.debian.org/656832
+# Author: Nick Leverton <nick@leverton.org>
+# Last-Update: 2012-02-22
+#
+Index: djmount/djmount/upnp_util.h
+===================================================================
+--- djmount.orig/djmount/upnp_util.h	2012-02-22 03:34:37.459476269 +0100
++++ djmount/djmount/upnp_util.h	2012-02-22 03:48:14.184514680 +0100
+@@ -28,6 +28,7 @@
+ 
+ 
+ #include <upnp/upnptools.h>
++#include <upnp/upnp.h>
+ 
+ 
+ #ifdef __cplusplus