Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'diizzyy/packages/patch-54'

Browse source
This commit is contained in:
Rafał Miłecki 2017-06-15 07:52:38 +02:00
commit 82814e68f0
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
multimedia/minidlna/Makefile
View file

@ -8,15 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=minidlna PKG_NAME:=minidlna
PKG_VERSION:=1.1.6+git-8a996b PKG_VERSION:=1.2.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=@SF/minidlna
PKG_SOURCE_URL=http://git.code.sf.net/p/minidlna/git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) PKG_HASH:=8d34436580c4c44be25976d5e46bc5b71af69bf441c4492774eac001164c4433
PKG_SOURCE_VERSION:=8a996b4b624ef45538a5de10730b8e94c55e7768
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_MIRROR_HASH:=fddbb7c96b40e335a251b919ff5c674519f266a59b8a43011761ba952c0df1b6
PKG_LICENSE:=GPL-2.0 BSD-3-Clause PKG_LICENSE:=GPL-2.0 BSD-3-Clause
PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd

8
multimedia/minidlna/patches/001-group-videos-by-directory-for-panasonic-tvs.patch
View file

@ -11,7 +11,7 @@ Subject: [PATCH] Add support for grouping videos by directory for Panasonic
--- a/upnpsoap.c --- a/upnpsoap.c
+++ b/upnpsoap.c +++ b/upnpsoap.c
@@ -1052,6 +1052,15 @@ callback(void *args, int argc, char **ar @@ -1095,6 +1095,15 @@ callback(void *args, int argc, char **ar
add_res(size, duration, bitrate, sampleFrequency, nrAudioChannels, add_res(size, duration, bitrate, sampleFrequency, nrAudioChannels,
resolution, dlna_buf, mime, detailID, ext, passed_args); resolution, dlna_buf, mime, detailID, ext, passed_args);
} }
@ -27,7 +27,7 @@ Subject: [PATCH] Add support for grouping videos by directory for Panasonic
break; break;
case ESamsungSeriesCDE: case ESamsungSeriesCDE:
case ELGDevice: case ELGDevice:
@@ -1314,8 +1323,11 @@ BrowseContentDirectory(struct upnphttp * @@ -1357,8 +1366,11 @@ BrowseContentDirectory(struct upnphttp *
if (!where[0]) if (!where[0])
sqlite3_snprintf(sizeof(where), where, "PARENT_ID = '%q'", ObjectID); sqlite3_snprintf(sizeof(where), where, "PARENT_ID = '%q'", ObjectID);
@ -40,7 +40,7 @@ Subject: [PATCH] Add support for grouping videos by directory for Panasonic
ret = 0; ret = 0;
if (SortCriteria && !orderBy) if (SortCriteria && !orderBy)
{ {
@@ -1354,14 +1366,16 @@ BrowseContentDirectory(struct upnphttp * @@ -1397,14 +1409,16 @@ BrowseContentDirectory(struct upnphttp *
SoapError(h, 709, "Unsupported or invalid sort criteria"); SoapError(h, 709, "Unsupported or invalid sort criteria");
goto browse_error; goto browse_error;
} }
@ -60,7 +60,7 @@ Subject: [PATCH] Add support for grouping videos by directory for Panasonic
} }
if( (ret != SQLITE_OK) && (zErrMsg != NULL) ) if( (ret != SQLITE_OK) && (zErrMsg != NULL) )
{ {
@@ -1795,7 +1809,7 @@ SearchContentDirectory(struct upnphttp * @@ -1838,7 +1852,7 @@ SearchContentDirectory(struct upnphttp *
(*ContainerID == '*') ? NULL : (*ContainerID == '*') ? NULL :
sqlite3_mprintf("UNION ALL " SELECT_COLUMNS sqlite3_mprintf("UNION ALL " SELECT_COLUMNS
"from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"

3
multimedia/minidlna/patches/002-dont-build-po-files.patch
View file

@ -9,10 +9,9 @@
sbin_PROGRAMS = minidlnad sbin_PROGRAMS = minidlnad
check_PROGRAMS = testupnpdescgen check_PROGRAMS = testupnpdescgen
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -633,6 +633,8 @@ case "$target_os" in @@ -644,6 +644,8 @@ case "$target_os" in
esac esac