[minidlna] update 1.1.4

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index cdc358a..cf2c1a1 100644 (file)
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -50,7 +50,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"
 
 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 commercial_libav"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav commercial_minidlna"

 LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-plugins-ugly"
 
 FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
 LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-plugins-ugly"
 
 FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"

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 (file)
--- 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.
 #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;");
        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;
  }
        return new_db;
  }

- 

diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf
deleted file mode 100644 (file)
index 798d303..0000000
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# port for HTTP (descriptions, SOAP, media transfer) traffic
-port=8200
-
-# network interfaces to serve, comma delimited
-#network_interface=eth0
-
-# 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:
-#   + "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)
-media_dir=/opt
-
-# set this if you want to customize the name that shows up on your clients
-#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
-#db_dir=/var/cache/minidlna
-
-# set this if you would like to specify the directory where you want MiniDLNA to store its log file
-#log_dir=/var/log
-
-# set this to change the verbosity of the information that is logged
-# each section can use a different level: off, fatal, error, warn, info, or debug
-#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn
-
-# this should be a list of file names to check for when searching for album art
-# note: names should be delimited with a forward slash ("/")
-album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
-
-# set this to no to disable inotify monitoring to automatically discover new files
-# note: the default is yes
-inotify=yes
-
-# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO
-enable_tivo=no
-
-# set this to strictly adhere to DLNA standards.
-# * This will allow server-side downscaling of very large JPEG images,
-#   which may hurt JPEG serving performance on (at least) Sony DLNA products.
-strict_dlna=no
-
-# default presentation url is http address on port 80
-#presentation_url=http://www.mylan/index.php
-
-# notify interval in seconds. default is 895 seconds.
-notify_interval=900
-
-# serial and model number the daemon will report to clients
-# in its XML description
-serial=12345678
-model_number=1
-
-# specify the path to the MiniSSDPd socket
-#minissdpdsocket=/var/run/minissdpd.sock
-
-# use different container as root of the tree
-# possible values:
-#   + "." - use standard container (this is the default)
-#   + "B" - "Browse Directory"
-#   + "M" - "Music"
-#   + "V" - "Video"
-#   + "P" - "Pictures"
-# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root
-#root_container=.

diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bbappend b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bbappend
new file mode 100644 (file)
index 0000000..f330675
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_1.1.4.bbappend
@@ -0,0 +1,11 @@
+
+PR .= "-vuplus0"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://default_sqlite_caches.diff"
+
+do_install_append() {
+        install -d ${D}/usr/bin
+        mv ${D}/usr/sbin/minidlnad ${D}/usr/bin/minidlna
+        rm -rf {D}/usr/sbin
+}

diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
deleted file mode 100644 (file)
index 0c37c33..0000000
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
+++ /dev/null
@@ -1,33 +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}"
-
-do_configure_prepend() {
-        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
-}
-
-inherit autotools-brokensep 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}
-}