summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmlee <smlee@dev3>2016-01-27 06:30:39 (GMT)
committersmlee <smlee@dev3>2016-01-27 06:30:39 (GMT)
commit86eb590f0aa9b34793aca7603e35162185663d90 (patch)
tree142ad572b11f49f2257223b9419d537dcd3b9251
parenta0c5910040de41e7339106c984ae57781c471394 (diff)
[minidlna] update 1.1.4HEADmaster
-rw-r--r--meta-openvuplus/conf/distro/vuplus.conf2
-rw-r--r--meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff19
-rwxr-xr-x[-rw-r--r--]meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf22
-rw-r--r--meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bb35
-rw-r--r--meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb29
5 files changed, 63 insertions, 44 deletions
diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index 129303a..ca52dca 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -53,7 +53,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inter
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_minidlna"
COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff
index e117d5d..91a84f9 100644
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff
@@ -1,20 +1,17 @@
#Don't increase page_size and default_cache_size.
#This patch reduces the memory footprint by about 50% without any major performance hits.
-Index: minidlna.c
-===================================================================
-RCS file: /cvsroot/minidlna/minidlna/minidlna.c,v
-retrieving revision 1.78
-diff -u -r1.78 minidlna.c
---- a/minidlna.c 10 Jan 2012 02:50:33 -0000 1.78
-+++ b/minidlna.c 23 Jan 2012 13:12:02 -0000
-@@ -320,10 +320,8 @@
- DPRINTF(E_FATAL, L_GENERAL, "ERROR: Failed to open sqlite database! Exiting...\n");
- }
+diff --git a/minidlna.c b/minidlna.c
+index be34fe3..45490a1 100644
+--- a/minidlna.c
++++ b/minidlna.c
+@@ -295,10 +295,8 @@ open_db(sqlite3 **sq3)
+ if (sq3)
+ *sq3 = db;
sqlite3_busy_timeout(db, 5000);
- sql_exec(db, "pragma page_size = 4096");
sql_exec(db, "pragma journal_mode = OFF");
sql_exec(db, "pragma synchronous = OFF;");
- sql_exec(db, "pragma default_cache_size = 8192;");
+
return new_db;
}
-
diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf
index 798d303..7e00e89 100644..100755
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf
@@ -4,15 +4,23 @@ port=8200
# network interfaces to serve, comma delimited
#network_interface=eth0
+# specify the user account name or uid to run as
+#user=jmaggard
+
# set this to the directory you want scanned.
-# * if have multiple directories, you can have multiple media_dir= lines
-# * if you want to restrict a media_dir to a specific content type, you
-# can prepend the type, followed by a comma, to the directory:
+# * if you want multiple directories, you can have multiple media_dir= lines
+# * if you want to restrict a media_dir to specific content types, you
+# can prepend the types, followed by a comma, to the directory:
# + "A" for audio (eg. media_dir=A,/home/jmaggard/Music)
# + "V" for video (eg. media_dir=V,/home/jmaggard/Videos)
# + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+# + "PV" for pictures and video (eg. media_dir=PV,/home/jmaggard/digital_camera)
media_dir=/opt
+# set this to merge all media_dir base contents into the root container
+# note: the default is no
+#merge_media_dirs=no
+
# set this if you want to customize the name that shows up on your clients
#friendly_name=My DLNA Server
@@ -63,5 +71,13 @@ model_number=1
# + "M" - "Music"
# + "V" - "Video"
# + "P" - "Pictures"
+# + Or, you can specify the ObjectID of your desired root container (eg. 1$F for Music/Playlists)
# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root
#root_container=.
+
+# always force SortCriteria to this value, regardless of the SortCriteria passed by the client
+#force_sort_criteria=+upnp:class,+upnp:originalTrackNumber,+dc:title
+
+# maximum number of simultaneous connections
+# note: many clients open several simultaneous connections while streaming
+#max_connections=50
diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 0000000..f86af0f
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,35 @@
+SUMMARY = "lightweight DLNA/UPnP-AV server targeted at embedded systems"
+HOMEPAGE = "http://sourceforge.net/projects/minidlna/"
+SECTION = "network"
+LICENSE = "GPL-2.0|BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b1a795ac1a06805cf8fd74920bc46b5c"
+DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = "commercial"
+SRCREV = "v1_1_4"
+PR .= "-vuplus0"
+
+SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://default_sqlite_caches.diff \
+ file://minidlna.conf \
+"
+
+S = "${WORKDIR}/git"
+
+inherit autotools gettext
+
+PACKAGES =+ "${PN}-utils"
+
+CONFFILES_${PN} = "${sysconfdir}/minidlna.conf"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}
+ install -m 644 minidlna.conf ${D}${sysconfdir}
+
+ install -d ${D}/usr/bin
+ mv ${D}/usr/sbin/minidlnad ${D}/usr/bin/minidlna
+ rm -rf {D}/usr/sbin
+}
+
+SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
+SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"
diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
deleted file mode 100644
index 49f8d86..0000000
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "lightweight DLNA/UPnP-AV server targeted at embedded systems"
-HOMEPAGE = "http://sourceforge.net/projects/minidlna/"
-SECTION = "network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b1a795ac1a06805cf8fd74920bc46b5c"
-DEPENDS = "libexif jpeg libid3tag flac libvorbis sqlite3 libav util-linux"
-SRCDATE = "20120408"
-PV = "1.0.99+cvs${SRCDATE}"
-PR = "r4"
-
-SRC_URI = "cvs://anonymous@minidlna.cvs.sourceforge.net/cvsroot/minidlna;module=minidlna \
- file://default_sqlite_caches.diff \
- file://minidlna.conf \
-"
-
-S = "${WORKDIR}/${PN}"
-
-inherit autotools gettext
-
-PACKAGES =+ "${PN}-utils"
-
-FILES_${PN}-utils = "${bindir}/test*"
-
-CONFFILES_${PN} = "${sysconfdir}/minidlna.conf"
-
-do_install_append() {
- install -d ${D}${sysconfdir}
- install -m 644 minidlna.conf ${D}${sysconfdir}
-}