cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to minidlna 1.1.4, from Mark Patruck

Browse Source
This commit is contained in:
sthen 2014-09-03 21:15:43 +00:00
parent ec4b657934
commit 76baea2d8c
4 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/minidlna/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2014/06/11 01:07:44 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2014/09/03 21:15:43 sthen Exp $
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.3
REVISION= 0
V= 1.1.4
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V

4
multimedia/minidlna/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (minidlna-1.1.3.tar.gz) = 7ULVyt+UiKlaAQc0GRiHnvjOTGUOGTN2iMRs3NSEvE4=
SIZE (minidlna-1.1.3.tar.gz) = 481789
SHA256 (minidlna-1.1.4.tar.gz) = mBTASixQag3ZQsQhjTDAfe35Dav/ve8tMIo/nyNUUxQ=
SIZE (minidlna-1.1.4.tar.gz) = 494478

17
multimedia/minidlna/patches/patch-metadata_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-metadata_c,v 1.4 2014/06/11 01:07:44 sthen Exp $
Crash with long long time_t on 32-bit systems
--- metadata.c.orig Wed Jun 11 02:03:16 2014
+++ metadata.c Wed Jun 11 02:03:30 2014
@@ -453,8 +453,8 @@ GetAudioMetadata(const char *path, char *name)
" (PATH, SIZE, TIMESTAMP, DURATION, CHANNELS, BITRATE, SAMPLERATE, DATE,"
" TITLE, CREATOR, ARTIST, ALBUM, GENRE, COMMENT, DISC, TRACK, DLNA_PN, MIME, ALBUM_ART) "
"VALUES"
- " (%Q, %lld, %ld, '%s', %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, '%s', %lld);",
- path, (long long)file.st_size, file.st_mtime, m.duration, song.channels, song.bitrate, song.samplerate, m.date,
+ " (%Q, %lld, %lld, '%s', %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, '%s', %lld);",
+ path, (long long)file.st_size, (long long)file.st_mtime, m.duration, song.channels, song.bitrate, song.samplerate, m.date,
m.title, m.creator, m.artist, m.album, m.genre, m.comment, song.disc, song.track,
m.dlna_pn, song.mime?song.mime:m.mime, album_art);
if( ret != SQLITE_OK )

23
multimedia/minidlna/patches/patch-upnphttp_c
View File

@ -1,14 +1,15 @@
$OpenBSD: patch-upnphttp_c,v 1.4 2014/06/11 00:26:59 sthen Exp $
--- upnphttp.c.orig Thu Jun 5 23:14:30 2014
+++ upnphttp.c Wed Jun 11 01:20:08 2014
@@ -1362,6 +1362,10 @@ SendResp_icon(struct upnphttp * h, char * icon)
"Server: " MINIDLNA_SERVER_STRING "\r\n\r\n",
mime, size, date);
$OpenBSD: patch-upnphttp_c,v 1.5 2014/09/03 21:15:44 sthen Exp $
--- upnphttp.c.orig Tue Aug 26 23:09:22 2014
+++ upnphttp.c Wed Sep 3 13:28:00 2014
@@ -1377,6 +1377,11 @@ SendResp_icon(struct upnphttp * h, char * icon)
start_dlna_header(&str, 200, "Interactive", mime);
strcatf(&str, "Content-Length: %d\r\n\r\n", size);
+#ifndef MSG_MORE
+/* linux uses this to combine multiple send() calls into a single packet */
+#define MSG_MORE 0
+#endif
if( send_data(h, header, ret, MSG_MORE) == 0 )
+ #ifndef MSG_MORE
+ /* linux uses this to combine multiple send() calls into a single packet */
+ #define MSG_MORE 0
+ #endif
+
if( send_data(h, str.data, str.off, MSG_MORE) == 0 )
{
if( h->req_command != EHead )