minidlna: 1.1.4+git20150805 -> 1.1.5; fix

Update Samsung F Series fix patch to (hopefully) be compatible with other Samsung Smart TV versions clients (specifically, D and E)

make/minidlna-rescan.mk

@@ -10,7 +10,7 @@
 # this cvs module is checked out.
 #
 
-MINIDLNA_RESCAN_REPOSITORY=git://git.code.sf.net/p/minidlna/git
+#MINIDLNA_RESCAN_REPOSITORY=git://git.code.sf.net/p/minidlna/git
 MINIDLNA_RESCAN_SITE=http://$(SOURCEFORGE_MIRROR)/sourceforge/minidlna
 ifndef MINIDLNA_RESCAN_REPOSITORY
 MINIDLNA_RESCAN_VERSION:=$(shell sed -n -e 's/^MINIDLNA_VERSION *=//p' make/minidlna.mk | head -1)
@@ -42,7 +42,7 @@ MINIDLNA_RESCAN_THUMBNAIL_CONFLICTS=minidlna-rescan, minidlna, minidlna-thumbnai
 #
 # MINIDLNA_RESCAN_IPK_VERSION should be incremented when the ipk changes.
 #
-MINIDLNA_RESCAN_IPK_VERSION=2
+MINIDLNA_RESCAN_IPK_VERSION=1
 
 #
 # MINIDLNA_RESCAN_CONFFILES should be a list of user-editable files

make/minidlna.mk

@@ -10,10 +10,10 @@
 # this cvs module is checked out.
 #
 
-MINIDLNA_REPOSITORY=git://git.code.sf.net/p/minidlna/git
+#MINIDLNA_REPOSITORY=git://git.code.sf.net/p/minidlna/git
 MINIDLNA_SITE=http://$(SOURCEFORGE_MIRROR)/sourceforge/minidlna
 ifndef MINIDLNA_REPOSITORY
-MINIDLNA_VERSION=1.1.4
+MINIDLNA_VERSION=1.1.5
 else
 MINIDLNA_VERSION=1.1.4+git20150805
 MINIDLNA_TREEISH=`git rev-list --max-count=1 --until=2015-08-05 HEAD`
@@ -43,7 +43,7 @@ MINIDLNA_THUMBNAIL_CONFLICTS=minidlna, minidlna-rescan, minidlna-rescan-thumbnai
 #
 # MINIDLNA_IPK_VERSION should be incremented when the ipk changes.
 #
-MINIDLNA_IPK_VERSION=6
+MINIDLNA_IPK_VERSION=1
 
 #
 # MINIDLNA_CONFFILES should be a list of user-editable files

sources/minidlna/minidlna-1.1.4_video_album_art_samsung_f-series_fix.patch

@@ -1,24 +1,17 @@
 --- a/upnpsoap.c
 +++ b/upnpsoap.c
-@@ -1079,10 +1079,17 @@
+@@ -1079,10 +1079,14 @@
  		{
  			/* Video and audio album art is handled differently */
  			if( *mime == 'v' && (passed_args->filter & FILTER_RES) && !(passed_args->flags & FLAG_MS_PFS) ) {
--				ret = strcatf(str, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">"
--				                   "http://%s:%d/AlbumArt/%s-%s.jpg"
--				                   "</res>",
--				                   lan_addr[passed_args->iface].str, runtime_vars.port, album_art, detailID);
-+				if( passed_args->client == ESamsungSeriesCDE){
-+					ret = strcatf(str, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM\">"
-+							   "http://%s:%d/AlbumArt/%s-%s.jpg"
-+							   "</res>",
-+							   lan_addr[passed_args->iface].str, runtime_vars.port, album_art, detailID);
-+				} else {
-+					ret = strcatf(str, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">"
-+							   "http://%s:%d/AlbumArt/%s-%s.jpg"
-+							   "</res>",
-+							   lan_addr[passed_args->iface].str, runtime_vars.port, album_art, detailID);
-+				}
+ 				ret = strcatf(str, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">"
+ 				                   "http://%s:%d/AlbumArt/%s-%s.jpg"
++				                   "</res>\n\n"
++						   "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM\">"
++				                   "http://%s:%d/AlbumArt/%s-%s.jpg"
+ 				                   "</res>",
++				                   lan_addr[passed_args->iface].str, runtime_vars.port, album_art, detailID,
+ 				                   lan_addr[passed_args->iface].str, runtime_vars.port, album_art, detailID);
  			} else if( passed_args->filter & FILTER_UPNP_ALBUMARTURI ) {
  				ret = strcatf(str, "<upnp:albumArtURI");
  				if( passed_args->filter & FILTER_UPNP_ALBUMARTURI_DLNA_PROFILEID ) {