head 1.3; access; symbols pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2; locks; strict; comment @# @; 1.3 date 2015.01.14.21.32.20; author degroote; state dead; branches; next 1.2; commitid plus0w8rPnJqp26y; 1.2 date 2012.12.17.12.51.32; author drochner; state Exp; branches; next 1.1; 1.1 date 2012.10.15.22.48.02; author drochner; state Exp; branches; next ; desc @@ 1.3 log @Upgrade minidlan to 1.1.4 Changes since 1.0.24: 1.1.4 - Released 26-Aug-2014 -------------------------------- - Add magic container infrastructure. - Add magic containers for 50 recent items for each category. - Fix bad null termination in AAC parsing. - Fix requests for the last byte of a file, which affected MKV playback on Philips TV's. - Support 64-bit time_t values. 1.1.3 - Released 05-June-2014 -------------------------------- - Enhance log level settings. - Fix Samsung browsing when root_container is set. - Add Clang compiling support. - Fix compiling on systems without iconv. - Add merge_media_dirs option, to revert to the old behavior. - Add Asus O!Play client support. - Fix Broken SSDP multicast membership addition. - Fix crash bug with an emtpy filter argument. - Accept SMI subtitles in addition to SRT. - Add BubbleUPnP detection and enable subtitle support. - Allow the user to specify an arbitrary root container. - Add libavcodec > 54 / libav 10 compatibility. - Get embedded cover art from video files with recent libavformat versions. - Disable Samsung DCM10 capability, as it breaks compatibility with new models. - Add subtitle support for NetFront™ Living Connect middleware-based clients. 1.1.2 - Released 06-Mar-2014 -------------------------------- - Show client status on our basic presentation page. - Add a new force_sort_criteria option, to globally override the SortCriteria value sent by the client. - Fix a couple resource leaks. - Add configuration include file support. - Support DLNA/UPnP-AV searches issued by clients using the Grilo framework. - Fix some clients playing artwork instead of movie. - Fix bookmarks on Samsung Series E clients. - Add an extra folder level if there are multiple media locations. - Fix some multicast membership issues with changing network settings. - Make max number of children (connections) configurable. - Fix choppy playback with some file types on Panasonic clients by increasing the max connection limit. 1.1.1 - Released 01-Nov-2013 -------------------------------- - Add network interface monitoring support on Linux. - Don't require a configured network interface to start up. - Fix some minor spec compliance issues. 1.1.0 - Released 04-April-2013 -------------------------------- - Add support for other operating systems. - Switch to autoconf from our handcrafted genconfig.sh. - Add configuration option for UUID. - Add configuration option to specify the user to run as. - Add support for limiting a media dir to multiple media types. - Force a rescan if we detect a new or missing media_dir entry. - Fix crash caused by certain TiVo clients. - Fix crash bug on video files with some ffmpeg library versions. - Add support for TiVo MPEG-TS files. - Add some logging and forking tweaks to work better with systemd. - Validate or escape user input to prevent SQL injection. - Add forced sorting support for Panasonic devices. 1.0.25 - Released 13-July-2012 -------------------------------- - Fix a couple crash bugs on malformed WAV files. - Forcibly tweak the model number for Xbox360 clients, or they might ignore us. - Enable all network interfaces by default if none were specified. - Add flag to force downscaled thumbnails rather than using embedded ones. - Add DirecTV client detection, and fix image resolution issue. - Add support for the latest ffmpeg/libav library versions. - Fix a potential crash on requests for a resize of a non-existent image. - Make DeviceID checking more permissive for Sagem Radio. @ text @$NetBSD: patch-replace-glob3,v 1.2 2012/12/17 12:51:32 drochner Exp $ --- metadata.c.orig 2012-06-29 21:11:29.000000000 +0000 +++ metadata.c @@@@ -25,14 +25,15 @@@@ #include #include #include +#include #include #include "image_utils.h" #include #include -#include -#include -#include +#include +#include +#include #include "tagutils/tagutils.h" #include "upnpglobalvars.h" @@@@ -194,8 +195,8 @@@@ check_for_captions(const char * path, sq /* If we weren't given a detail ID, look for one. */ if( !detailID ) { - id = sql_get_text_field(db, "SELECT ID from DETAILS where PATH glob '%q.*'" - " and MIME glob 'video/*' limit 1", file); + id = sql_get_text_field(db, "SELECT ID from DETAILS where (PATH > '%q.' and PATH <= '%q.z'" + " and MIME > 'video/' and MIME <= 'video/z') limit 1", file, file); if( id ) { //DEBUG DPRINTF(E_DEBUG, L_METADATA, "New file %s looks like a caption file.\n", path); @@@@ -504,8 +505,8 @@@@ GetAudioMetadata(const char * path, char " (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 ) @ 1.2 log @make this build again @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @import the FreeBSD port of minidlna, with minor adaptions to make it build and start up on NetBSD not tested with a real media renderer yet @ text @d5 1 a5 1 @@@@ -25,6 +25,7 @@@@ d13 11 @