bump version minidlna-1.3.2

diff --git a/archive-patches/djmount-0.71.diff b/archive-patches/djmount-0.71.diff
deleted file mode 100644 (file)
index ec61092..0000000
--- a/archive-patches/djmount-0.71.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ur djmount-0.71-orig/djmount/file_buffer.c djmount-0.71/djmount/file_buffer.c
---- djmount-0.71-orig/djmount/file_buffer.c    2006-08-27 22:12:20.000000000 +0200
-+++ djmount-0.71/djmount/file_buffer.c 2012-12-01 18:40:29.892922733 +0100
-@@ -199,7 +199,7 @@
-               int rc = UpnpOpenHttpGetEx (file->url, &handle,
-                                           &contentType, &contentLength,
-                                           &httpStatus,
--                                          offset, offset + size,
-+                                          offset, offset + size - 1,
-                                           HTTP_DEFAULT_TIMEOUT
-                                           );
-               if (rc != UPNP_E_SUCCESS) 
-diff -ur djmount-0.71-orig/djmount/file_buffer.h djmount-0.71/djmount/file_buffer.h
---- djmount-0.71-orig/djmount/file_buffer.h    2006-08-27 22:12:20.000000000 +0200
-+++ djmount-0.71/djmount/file_buffer.h 2012-12-01 18:41:50.552927328 +0100
-@@ -60,7 +60,7 @@
-  *
-  *****************************************************************************/
- 
--#define FILE_BUFFER_MAX_CONTENT_LENGTH                ((uintmax_t) INT_MAX)
-+#define FILE_BUFFER_MAX_CONTENT_LENGTH                ((uintmax_t) ~0ULL)
- 
- 
- /*****************************************************************************
-diff -ur djmount-0.71-orig/djmount/media_file.c djmount-0.71/djmount/media_file.c
---- djmount-0.71-orig/djmount/media_file.c     2006-08-27 22:12:20.000000000 +0200
-+++ djmount-0.71/djmount/media_file.c  2012-12-01 18:43:37.382921337 +0100
-@@ -282,7 +282,7 @@
- {
-       const char* const str = ixmlElement_getAttribute (file->res, "size");
-       off_t res;
--      STRING_TO_INT (str, res, -1);
-+      STRING_TO_INT (str, res, 8ULL << 30);
-       return res;
- }
- 
-diff -ur djmount-0.71-orig/libupnp/upnp/inc/upnp.h djmount-0.71/libupnp/upnp/inc/upnp.h
---- djmount-0.71-orig/libupnp/upnp/inc/upnp.h  2006-08-27 22:12:30.000000000 +0200
-+++ djmount-0.71/libupnp/upnp/inc/upnp.h       2012-12-01 18:44:21.112924671 +0100
-@@ -2262,9 +2262,9 @@
-       IN OUT int *httpStatus,     /** The status returned on receiving a 
-                                       response message from the remote 
-                                       server. */
--      IN int lowRange,            /** An integer value representing the low 
-+      IN unsigned long long lowRange,            /** An integer value representing the low 
-                                       end of a range to retrieve. */
--      IN int highRange,           /** An integer value representing the high 
-+      IN unsigned long long highRange,           /** An integer value representing the high 
-                                       end of a range to retrieve. */
-       IN int timeout              /** A time out value sent with the request 
-                                       during which a response is expected 
-diff -ur djmount-0.71-orig/libupnp/upnp/src/api/upnpapi.c djmount-0.71/libupnp/upnp/src/api/upnpapi.c
---- djmount-0.71-orig/libupnp/upnp/src/api/upnpapi.c   2006-08-27 22:12:26.000000000 +0200
-+++ djmount-0.71/libupnp/upnp/src/api/upnpapi.c        2012-12-01 18:45:03.452924224 +0100
-@@ -3117,8 +3117,8 @@
-                    IN OUT char **contentType,
-                    OUT int *contentLength,
-                    OUT int *httpStatus,
--                   IN int lowRange,
--                   IN int highRange,
-+                   IN unsigned long long lowRange,
-+                   IN unsigned long long highRange,
-                    IN int timeout )
- {
-     return http_OpenHttpGetEx( url_str,
-diff -ur djmount-0.71-orig/libupnp/upnp/src/genlib/net/http/httpreadwrite.c djmount-0.71/libupnp/upnp/src/genlib/net/http/httpreadwrite.c
---- djmount-0.71-orig/libupnp/upnp/src/genlib/net/http/httpreadwrite.c 2006-08-27 22:12:24.000000000 +0200
-+++ djmount-0.71/libupnp/upnp/src/genlib/net/http/httpreadwrite.c      2012-12-01 18:45:56.082928622 +0100
-@@ -2072,8 +2072,8 @@
-                     IN OUT char **contentType,
-                     OUT int *contentLength,
-                     OUT int *httpStatus,
--                    IN int lowRange,
--                    IN int highRange,
-+                    IN unsigned long long lowRange,
-+                    IN unsigned long long highRange,
-                     IN int timeout )
- {
-     int http_error_code;
-@@ -2107,7 +2107,7 @@
-         }
- 
-         memset( &rangeBuf, 0, sizeof( rangeBuf ) );
--        sprintf( rangeBuf.RangeHeader, "Range: bytes=%d-%d\r\n",
-+        sprintf( rangeBuf.RangeHeader, "Range: bytes=%llu-%llu\r\n",
-                  lowRange, highRange );
- 
-         membuffer_init( &request );
-diff -ur djmount-0.71-orig/libupnp/upnp/src/inc/httpreadwrite.h djmount-0.71/libupnp/upnp/src/inc/httpreadwrite.h
---- djmount-0.71-orig/libupnp/upnp/src/inc/httpreadwrite.h     2006-08-27 22:12:28.000000000 +0200
-+++ djmount-0.71/libupnp/upnp/src/inc/httpreadwrite.h  2012-12-01 18:46:22.362922742 +0100
-@@ -494,8 +494,8 @@
-                    IN OUT char **contentType,
-                    OUT int *contentLength,
-                    OUT int *httpStatus,
--                       IN int lowRange,
--                       IN int highRange,
-+                       IN unsigned long long lowRange,
-+                       IN unsigned long long highRange,
-                    IN int timeout);
- 
- /************************************************************************
\ No newline at end of file

diff --git a/archive-patches/eglibc-2_8-new-make.patch b/archive-patches/eglibc-2_8-new-make.patch
deleted file mode 100644 (file)
index 0c33585..0000000
--- a/archive-patches/eglibc-2_8-new-make.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/manual/Makefile b/manual/Makefile
-index c5866eb..ee4b852 100644
---- a/manual/Makefile
-+++ b/manual/Makefile
-@@ -232,7 +232,11 @@ ifdef objpfx
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+$(objpfx)stubs ../po/manual.pot:
-+      $(make-target-directory)
-+      touch $@
-+
-+$(objpfx)stamp%:
-       $(make-target-directory)
-       touch $@
- 

diff --git a/archive-patches/minidlna-1.1.5.patch b/archive-patches/minidlna-1.1.5.patch
deleted file mode 100644 (file)
index 6e4b962..0000000
--- a/archive-patches/minidlna-1.1.5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/minidlna.c
-+++ b/minidlna.c
-@@ -295,10 +295,8 @@
-       if (sq3)
-               *sq3 = db;
-       sqlite3_busy_timeout(db, 5000);
--      sql_exec(db, "pragma page_size = 4096");
-       sql_exec(db, "pragma journal_mode = OFF");
-       sql_exec(db, "pragma synchronous = OFF;");
--      sql_exec(db, "pragma default_cache_size = 8192;");
- 
-       return new_db;
- }
---- a/metadata.c
-+++ b/metadata.c
-@@ -502,7 +502,7 @@
- }
- 
- /* For libjpeg error handling */
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
- {
---- a/image_utils.c
-+++ b/image_utils.c
-@@ -190,7 +190,7 @@
-       src->pub.bytes_in_buffer = bufsize;
- }
- 
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- /* Don't exit on error like libjpeg likes to do */
- static void
- libjpeg_error_handler(j_common_ptr cinfo)

diff --git a/make/applications.mk b/make/applications.mk
index 88f675b4f09e14c3dcab55cee5092b5fff622cc1..26aa7fad41f68eed2de6b056a5ce9c1d40b5de06 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -271,7 +271,6 @@ $(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $(
        $(START_BUILD)
        $(UNTAR)/minidlna-$(MINIDLNA_VER).tar.gz
        set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \
-               $(PATCH)/minidlna-$(MINIDLNA_VER).patch; \
                autoreconf -fi; \
                $(CONFIGURE) \
                        --prefix=/ \

diff --git a/make/versions.mk b/make/versions.mk
index 2d161e6c4028c659c1c8455321c346978e53cb44..6324c6c2142f795bd2ebcc0ff195cd9a56c70940 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -185,7 +185,7 @@ LZO_VER = 2.10
 MC_VER = 4.8.21
 
 # mini-DLNA
-MINIDLNA_VER = 1.1.5
+MINIDLNA_VER = 1.3.2
 
 # mtd-utils for the host and target
 MTD_UTILS_VER = 2.0.2