add util(djmount and minidlna)

diff --git a/recipes/djmount/djmount_0.71.bb b/recipes/djmount/djmount_0.71.bb
index 06c882d..e2bc079 100644 (file)
--- a/recipes/djmount/djmount_0.71.bb
+++ b/recipes/djmount/djmount_0.71.bb
@@ -2,18 +2,14 @@ DESCRIPTION = "mount UPnP server content as a linux filesystem"
 HOMEPAGE = "http://djmount.sourceforge.net/"
 LICENSE = "GPL"
 DEPENDS = "libupnp fuse"
-RDEPENDS = "fuse-utils fuse-module"
-PR = "r1"
+RDEPENDS_${PN} = "fuse-utils fuse"
+PR = "r2"
 
-INITSCRIPT_NAME = "djmount"
-INITSCRIPT_PARAMS = "defaults"
-
-inherit autotools update-rc.d
+inherit autotools
 
 EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='/usr/lib/'"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/djmount/djmount-0.71.tar.gz \
-       file://init \
        file://filebuffer-fix_range.patch;patch=1"
 
 do_configure() {
@@ -21,7 +17,3 @@ do_configure() {
        oe_runconf
 }
 
-do_install_append() {
-       install -d ${D}/etc/init.d
-       install -m 0755 ${WORKDIR}/init ${D}/etc/init.d/djmount
-}

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 6ada7ac..36b60fa 100644 (file)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -4,7 +4,7 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
        dreambox-dvbincludes freetype libdvbsi++ python swig-native \
        libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \
        gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi wvdial wvstreams ppp usbmodeswitch usbmodeswitch-data \
-       hostap-daemon bridge-utils"
+       hostap-daemon bridge-utils djmount minidlna "
 RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
        python-xml python-fcntl gst-plugin-decodebin gst-plugin-decodebin2 python-stringold \
        python-pickle gst-plugin-app gst-plugin-fragmented \
@@ -69,9 +69,11 @@ RDEPENDS_enigma2-plugin-systemplugins-crashreport = "twisted-mail twisted-names
 RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usbmodeswitch usbmodeswitch-data wvdial wvstreams libwvutils4.6 libwvstreams-extras libuniconf4.6"
 RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
 RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugin-rtmp "
+RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount fuse-utils libfuse2 libupnp3 kernel-module-fuse "
+RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna libexif12 libavformat52 libavutil50 libavcodec52 libgsm1 libmp3lame0 libschroedinger-1.0-0 libtheora0 liboil"
 
 PN = "enigma2"
-PR = "r30"
+PR = "r31"
 
 SRCDATE = "20110922"
 SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"

diff --git a/recipes/minidlna/files/minidlna_compile.patch b/recipes/minidlna/files/minidlna_compile.patch
new file mode 100644 (file)
index 0000000..933ab62
--- /dev/null
+++ b/recipes/minidlna/files/minidlna_compile.patch
@@ -0,0 +1,33 @@
+diff --git a/metadata.c b/metadata.c
+index 3c196b2..1b2dc7b 100644
+--- a/metadata.c
++++ b/metadata.c
+@@ -30,9 +30,15 @@
+ #include "image_utils.h"
+ #include <jpeglib.h>
+ #include <setjmp.h>
++#if 0
+ #include <avutil.h>
+ #include <avcodec.h>
+ #include <avformat.h>
++#else
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#endif
+ #include "tagutils/tagutils.h"
+ 
+ #include "upnpglobalvars.h"
+diff --git a/tagutils/tagutils-plist.c b/tagutils/tagutils-plist.c
+index dc76917..5a26bfc 100644
+--- a/tagutils/tagutils-plist.c
++++ b/tagutils/tagutils-plist.c
+@@ -27,7 +27,7 @@
+ #include "misc.h"
+ #include "tagutils.h"
+ #include "textutils.h"
+-#include "log.h"
++#include "../log.h"
+ 
+ 
+ #define MAX_BUF 4096

diff --git a/recipes/minidlna/minidlna_1.0.24.bb b/recipes/minidlna/minidlna_1.0.24.bb
new file mode 100644 (file)
index 0000000..af34c8b
--- /dev/null
+++ b/recipes/minidlna/minidlna_1.0.24.bb
@@ -0,0 +1,4 @@
+require minidlna_1.0.inc
+
+PR = "${INC_PR}.0"
+

diff --git a/recipes/minidlna/minidlna_1.0.inc b/recipes/minidlna/minidlna_1.0.inc
new file mode 100644 (file)
index 0000000..09c8aad
--- /dev/null
+++ b/recipes/minidlna/minidlna_1.0.inc
@@ -0,0 +1,30 @@
+DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. \
+               It is developed by a NETGEAR employee for the ReadyNAS product line. \
+               So if you are looking for a NAS, please consider ReadyNAS first!"
+HOMEPAGE = "http://minidlna.sourceforge.net/"
+LICENSE = "GPL"
+SECTION = "net"
+DEPENDS = "libexif ffmpeg"
+
+INC_PR = "r2"
+
+SRC_URI = "http://downloads.sourceforge.net/project/minidlna/minidlna/${PV}/${PN}_${PV}_src.tar.gz \
+          file://minidlna_compile.patch;patch=1 \
+"
+
+CONFFILES_${PN} = "${sysconfdir}/minidlna.conf"
+CFLAGS_prepend = "-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I${STAGING_INCDIR}/ffmpeg "
+
+do_configure() {
+    sed -i "s:/usr/include:${STAGING_INCDIR}:g" genconfig.sh
+    sed -i "s/^CFLAGS =/#CFLAGS =/" Makefile
+    sed -i "s/^CC =/#CC =/" Makefile
+    sed -i "/^minidlna\:/ s/[$][(]LIBS[)]//" Makefile
+    sed -i "s/--mode=0644//" Makefile
+    sed -i "s:^media_dir=/opt:media_dir=/media:" minidlna.conf
+    ./genconfig.sh
+}
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install install-conf
+}

diff --git a/recipes/tasks/task-vuplus-enigma2.bb b/recipes/tasks/task-vuplus-enigma2.bb
index 86762e2..1a7fa0a 100644 (file)
--- a/recipes/tasks/task-vuplus-enigma2.bb
+++ b/recipes/tasks/task-vuplus-enigma2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Vuplus: E2 Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
-PR = "r18"
+PR = "r19"
 
 inherit task
 
@@ -33,6 +33,8 @@ RDEPENDS_task-vuplus-enigma2 = "\
   enigma2-plugin-systemplugins-crashreport \
   enigma2-plugin-systemplugins-3gmodemmanager \
   enigma2-plugin-extensions-streamtv \
+  enigma2-plugin-extensions-dlnaserver \
+  enigma2-plugin-extensions-dlnabrowser \
 "
 
 RRECOMMENDS_task-vuplus-enigma2 = "\