svn commit: r358288 - in head/net/minidlna: . files
William Grzybowski
wg at FreeBSD.org
Wed Jun 18 16:51:32 UTC 2014
Author: wg
Date: Wed Jun 18 16:51:31 2014
New Revision: 358288
URL: http://svnweb.freebsd.org/changeset/ports/358288
QAT: https://qat.redports.org/buildarchive/r358288/
Log:
net/minidlna: update to 1.1.3
- Update to 1.1.3 [1]
- Update kqueue patch
PR: 191078 [1]
Submitted by: spil.oss gmail com
Deleted:
head/net/minidlna/files/patch-clang-inline
Modified:
head/net/minidlna/Makefile
head/net/minidlna/distinfo
head/net/minidlna/files/extra-patch-kqueue
head/net/minidlna/files/patch-minidlna.conf
Modified: head/net/minidlna/Makefile
==============================================================================
--- head/net/minidlna/Makefile Wed Jun 18 16:45:31 2014 (r358287)
+++ head/net/minidlna/Makefile Wed Jun 18 16:51:31 2014 (r358288)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= minidlna
-PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.3
PORTEPOCH= 1
CATEGORIES= net multimedia www
MASTER_SITES= SF
Modified: head/net/minidlna/distinfo
==============================================================================
--- head/net/minidlna/distinfo Wed Jun 18 16:45:31 2014 (r358287)
+++ head/net/minidlna/distinfo Wed Jun 18 16:51:31 2014 (r358288)
@@ -1,2 +1,2 @@
-SHA256 (minidlna-1.1.2.tar.gz) = 97e2e9141c1190d76ad97f0da083874bccf9f9590841be9eb7668bcf695b7204
-SIZE (minidlna-1.1.2.tar.gz) = 671295
+SHA256 (minidlna-1.1.3.tar.gz) = ed42d5cadf9488a95a0107341918879ef8ce4c650e19337688c46cdcd484bc4e
+SIZE (minidlna-1.1.3.tar.gz) = 481789
Modified: head/net/minidlna/files/extra-patch-kqueue
==============================================================================
--- head/net/minidlna/files/extra-patch-kqueue Wed Jun 18 16:45:31 2014 (r358287)
+++ head/net/minidlna/files/extra-patch-kqueue Wed Jun 18 16:51:31 2014 (r358288)
@@ -270,22 +270,6 @@
if( id )
{
if( !depth )
-@@ -421,13 +466,13 @@
-
- if( !depth )
- {
-- //DEBUG DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name);
-+ DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name);
- insert_file(name, path, id+2, get_next_available_id("OBJECTS", id));
- sqlite3_free(id);
- if( (is_audio(path) || is_playlist(path)) && next_pl_fill != 1 )
- {
- next_pl_fill = time(NULL) + 120; // Schedule a playlist scan for 2 minutes from now.
-- //DEBUG DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill));
-+ //DEBUG DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill));
- }
- }
- return depth;
@@ -446,6 +491,8 @@
struct media_dir_s* media_path;
struct stat st;
@@ -304,20 +288,6 @@
if( !id )
id = sqlite3_mprintf("%s", BROWSEDIR_ID);
insert_directory(name, path, BROWSEDIR_ID, id+2, get_next_available_id("OBJECTS", id));
-@@ -538,9 +585,12 @@
- int64_t detailID;
- int rows, playlist;
-
-+ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_file: %s\n", path);
-+
- if( ends_with(path, ".srt") )
- {
-- return sql_exec(db, "DELETE from CAPTIONS where PATH = '%q'", path);
-+ rows = sql_exec(db, "DELETE from CAPTIONS where PATH = '%q'", path);
-+ return rows;
- }
- /* Invalidate the scanner cache so we don't insert files into non-existent containers */
- valid_cache = 0;
@@ -554,27 +604,25 @@
{
sql_exec(db, "DELETE from PLAYLISTS where ID = %lld", detailID);
@@ -419,25 +389,6 @@
if( !length )
{
if( next_pl_fill && (time(NULL) >= next_pl_fill) )
-@@ -682,14 +737,14 @@
- }
- else if( length < 0 )
- {
-- if( (errno == EINTR) || (errno == EAGAIN) )
-- continue;
-- else
-+ if( (errno == EINTR) || (errno == EAGAIN) )
-+ continue;
-+ else
- DPRINTF(E_ERROR, L_INOTIFY, "read failed!\n");
- }
- else
- {
-- length = read(pollfds[0].fd, buffer, BUF_LEN);
-+ length = read(pollfds[0].fd, buffer, BUF_LEN);
- }
-
- i = 0;
@@ -707,12 +762,12 @@
sprintf(path_buf, "%s/%s", get_path_from_wd(event->wd), event->name);
if ( event->mask & IN_ISDIR && (event->mask & (IN_CREATE|IN_MOVED_TO)) )
@@ -587,7 +538,7 @@
+ if ( !found_flag )
+ {
+ char * esc_name = NULL;
-+ esc_name = modifyString(strdup(entry->d_name), "&", "&");
++ esc_name = modifyString(strdup(entry->d_name), "&", "&", 0);
+ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path);
+ free(esc_name);
+ }
@@ -672,7 +623,7 @@
+ continue;
+ }
+
-+ esc_name = modifyString(strdup(entry->d_name), "&", "&");
++ esc_name = modifyString(strdup(entry->d_name), "&", "&", 0);
+ if ( S_ISDIR(st.st_mode) )
+ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path);
+ else
@@ -721,33 +672,6 @@
" (ID, PATH) "
"VALUES"
" (%lld, %Q)", detailID, file);
-@@ -492,7 +492,7 @@
- m.dlna_pn, song.mime?song.mime:m.mime, album_art);
- if( ret != SQLITE_OK )
- {
-- fprintf(stderr, "Error inserting details for '%s'!\n", path);
-+ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path);
- ret = 0;
- }
- else
-@@ -675,7 +675,7 @@
- m.rotation, thumb, m.creator, m.dlna_pn, m.mime);
- if( ret != SQLITE_OK )
- {
-- fprintf(stderr, "Error inserting details for '%s'!\n", path);
-+ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path);
- ret = 0;
- }
- else
-@@ -1587,7 +1587,7 @@
- m.mime, album_art);
- if( ret != SQLITE_OK )
- {
-- fprintf(stderr, "Error inserting details for '%s'!\n", path);
-+ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path);
- ret = 0;
- }
- else
--- ./minidlna.c.orig 2013-11-02 05:06:41.000000000 +0400
+++ ./minidlna.c 2013-11-13 17:25:27.000000000 +0400
@@ -46,6 +46,7 @@
@@ -790,17 +714,6 @@
#endif
smonitor = OpenAndConfMonitorSocket();
---- ./scanner.c.orig 2013-11-02 05:06:41.000000000 +0400
-+++ ./scanner.c 2013-11-13 17:25:27.000000000 +0400
-@@ -590,7 +590,7 @@
-
- sql_failed:
- if( ret != SQLITE_OK )
-- fprintf(stderr, "Error creating SQLite3 database!\n");
-+ DPRINTF(E_ERROR, L_DB_SQL, "Error creating SQLite3 database!\n");
- return (ret != SQLITE_OK);
- }
-
--- upnpevents.c.orig 2013-11-02 02:06:41.000000000 +0100
+++ upnpevents.c 2013-12-24 12:22:41.533935174 +0100
@@ -416,6 +416,10 @@
@@ -841,12 +754,3 @@
ts = sql_get_int_field(db, "SELECT TIMESTAMP from DETAILS where PATH = '%q'", path);
if( !ts && is_playlist(path) && (sql_get_int_field(db, "SELECT ID from PLAYLISTS where PATH = '%q'", path) > 0) )
{
-@@ -472,7 +483,7 @@
- if( (is_audio(path) || is_playlist(path)) && next_pl_fill != 1 )
- {
- next_pl_fill = time(NULL) + 120; // Schedule a playlist scan for 2 minutes from now.
-- //DEBUG DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill));
-+ DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill));
- }
- }
- return depth;
Modified: head/net/minidlna/files/patch-minidlna.conf
==============================================================================
--- head/net/minidlna/files/patch-minidlna.conf Wed Jun 18 16:45:31 2014 (r358287)
+++ head/net/minidlna/files/patch-minidlna.conf Wed Jun 18 16:51:31 2014 (r358288)
@@ -1,8 +1,6 @@
-diff --git minidlna.conf minidlna.conf
-index bfb71d5..b579912 100644
---- minidlna.conf
-+++ minidlna.conf
-@@ -21,7 +21,7 @@ media_dir=/opt
+--- minidlna.conf.orig 2014-06-06 00:14:30.000000000 +0200
++++ minidlna.conf 2014-06-16 10:05:28.456790810 +0200
+@@ -25,7 +25,7 @@
#friendly_name=My DLNA Server
# set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache
@@ -11,3 +9,13 @@ index bfb71d5..b579912 100644
# set this if you would like to specify the directory where you want MiniDLNA to store its log file
#log_dir=/var/log
+@@ -61,6 +61,9 @@
+ serial=12345678
+ model_number=1
+
++# Override the uuid to run multiple instances
++# uuid=550e8400-e29b-41d4-a716-446655440000
++
+ # specify the path to the MiniSSDPd socket
+ #minissdpdsocket=/var/run/minissdpd.sock
+
More information about the svn-ports-head
mailing list