<div dir="ltr">Wrong list - meta-oe patches go to openembedded-devel@ not -core@.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 3 March 2015 at 17:32, Baptiste DURAND <span dir="ltr"><<a href="mailto:baptiste.durand@gmail.com" target="_blank">baptiste.durand@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Baptiste DURAND <<a href="mailto:baptiste.durand@gmail.com">baptiste.durand@gmail.com</a>><br>
---<br>
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39 ++++++++++++++++<br>
.../minidlna/minidlna/minidlna-daemon.init.d | 54 ++++++++++++++++++++++<br>
.../minidlna/minidlna/minidlna-daemon.service | 11 +++++<br>
.../recipes-multimedia/minidlna/<a href="http://minidlna_1.1.4.bb" target="_blank">minidlna_1.1.4.bb</a> | 6 +++<br>
.../minidlna/minidlna/fix-makefile.patch | 41 ----------------<br>
.../search-for-headers-in-staging-dir.patch | 48 -------------------<br>
.../nonworking/minidlna/<a href="http://minidlna_1.0.25.bb" target="_blank">minidlna_1.0.25.bb</a> | 19 --------<br>
7 files changed, 110 insertions(+), 108 deletions(-)<br>
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc<br>
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d<br>
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service<br>
create mode 100644 meta-oe/recipes-multimedia/minidlna/<a href="http://minidlna_1.1.4.bb" target="_blank">minidlna_1.1.4.bb</a><br>
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch<br>
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch<br>
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/<a href="http://minidlna_1.0.25.bb" target="_blank">minidlna_1.0.25.bb</a><br>
<br>
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/meta-oe/recipes-multimedia/minidlna/minidlna.inc<br>
new file mode 100644<br>
index 0000000..9d6568d<br>
--- /dev/null<br>
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc<br>
@@ -0,0 +1,39 @@<br>
+DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \<br>
+being fully compliant with DLNA/UPnP-AV clients."<br>
+LICENSE = "GPL-2.0|BSD"<br>
+DEPENDS = "virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"<br>
+<br>
+inherit autotools update-rc.d systemd<br>
+<br>
+SRC_URI = "git://<a href="http://git.code.sf.net/p/minidlna/git;branch=master;module=git" target="_blank">git.code.sf.net/p/minidlna/git;branch=master;module=git</a>"<br>
+SRC_URI =+ "${@base_contains('DISTRO_FEATURES', 'systemd', 'file://minidlna-daemon.service', 'file://minidlna-daemon.init.d', d)}"<br>
+<br>
+S = "${WORKDIR}/git"<br>
+B = "${S}"<br>
+<br>
+do_configure_prepend() {<br>
+cd ${S}<br>
+./autogen.sh<br>
+}<br>
+<br>
+do_install_initd() {<br>
+ install -d ${D}${sysconfdir}/init.d<br>
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna<br>
+}<br>
+<br>
+do_install_systemd() {<br>
+ install -d ${D}${nonarch_base_libdir}/systemd/system<br>
+ install -m 0755 ${WORKDIR}/minidlna-daemon.service ${D}${nonarch_base_libdir}/systemd/system<br>
+}<br>
+<br>
+do_install_append(){<br>
+ install -d ${D}${sysconfdir}<br>
+ install -m 0755 minidlna.conf ${D}${sysconfdir}<br>
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd', 'do_install_initd', d)}<br>
+}<br>
+<br>
+SYSTEMD_SERVICE_${PN} = "minidlna-daemon.service"<br>
+<br>
+INITSCRIPT_NAME = "minidlna"<br>
+INITSCRIPT_PARAMS = "defaults 90"<br>
+<br>
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d<br>
new file mode 100644<br>
index 0000000..e5db389<br>
--- /dev/null<br>
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d<br>
@@ -0,0 +1,54 @@<br>
+#!/bin/sh<br>
+<br>
+NAME="minidlna"<br>
+DAEMON=$(which $NAME)<br>
+SCRIPTNAME=/etc/init.d/$NAME<br>
+PIDFILE=/var/run/$NAME.pid<br>
+CONF=/etc/$NAME.conf<br>
+ARGS="-f $CONF"<br>
+<br>
+# Exit if the package is not installed<br>
+[ -x "$DAEMON" ] || exit 0<br>
+<br>
+start_function() {<br>
+<br>
+ export PATH=$PWD:$PATH<br>
+<br>
+ if [ -f ${PIDFILE} ]; then<br>
+ echo "$SCRIPTNAME already running with PID #`cat $PIDFILE` ( according to ${PIDFILE} )";<br>
+ exit 0<br>
+ fi<br>
+<br>
+ $DAEMON $ARGS<br>
+<br>
+ pid=$!<br>
+<br>
+ if [ "$pid" != "" ]; then<br>
+ echo -n "$pid" > ${PIDFILE}<br>
+ fi<br>
+}<br>
+<br>
+stop_function() {<br>
+<br>
+ export PATH=$PWD:$PATH<br>
+<br>
+ if [ ! -e "${PIDFILE}" ]; then<br>
+ echo "${SCRIPTNAME} not running ( according to ${PIDFILE} )";<br>
+ exit 1;<br>
+ fi<br>
+ PID=`cat ${PIDFILE}`<br>
+ kill -INT ${PID}<br>
+ rm -f ${PIDFILE}<br>
+}<br>
+<br>
+case $1 in<br>
+ "start")<br>
+ start_function<br>
+ ;;<br>
+ "stop")<br>
+ stop_function<br>
+ ;;<br>
+ *)<br>
+ echo "Usage: $0 {start | stop}"<br>
+<br>
+esac<br>
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service<br>
new file mode 100644<br>
index 0000000..fa9fb36<br>
--- /dev/null<br>
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service<br>
@@ -0,0 +1,11 @@<br>
+[Unit]<br>
+Description=Minidlna Daemon<br>
+After=network.target<br>
+<br>
+[Service]<br>
+User=transmission<br>
+Type=notify<br>
+ExecStart=/usr/bin/minidlna -f /etc/minidlna.conf<br>
+<br>
+[Install]<br>
+WantedBy=multi-user.target<br>
diff --git a/meta-oe/recipes-multimedia/minidlna/<a href="http://minidlna_1.1.4.bb" target="_blank">minidlna_1.1.4.bb</a> b/meta-oe/recipes-multimedia/minidlna/<a href="http://minidlna_1.1.4.bb" target="_blank">minidlna_1.1.4.bb</a><br>
new file mode 100644<br>
index 0000000..0531e69<br>
--- /dev/null<br>
+++ b/meta-oe/recipes-multimedia/minidlna/<a href="http://minidlna_1.1.4.bb" target="_blank">minidlna_1.1.4.bb</a><br>
@@ -0,0 +1,6 @@<br>
+require ${BPN}.inc<br>
+<br>
+SRCREV = "v1_1_4"<br>
+LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"<br>
+SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"<br>
+SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"<br>
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch<br>
deleted file mode 100644<br>
index 96429fd..0000000<br>
--- a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch<br>
+++ /dev/null<br>
@@ -1,41 +0,0 @@<br>
-Fix Makefile:<br>
-* don't overwrite CFLAGS but append to it<br>
-* use gcc as CC only if CC is not already defined<br>
-* use -I= to include paths<br>
-* fix compile of minidlna binary by removing ${LIBS} dependency<br>
-<br>
-Upstream-status: Pending<br>
-Signed-off-by: Andrei Gherzan <<a href="mailto:andrei@gherzan.ro">andrei@gherzan.ro</a>><br>
-<br>
-Index: minidlna-1.0.25/Makefile<br>
-===================================================================<br>
---- minidlna-1.0.25.orig/Makefile 2012-01-18 00:49:01.000000000 +0200<br>
-+++ minidlna-1.0.25/Makefile 2013-02-10 17:46:49.000000000 +0200<br>
-@@ -12,13 +12,13 @@<br>
- #<br>
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG<br>
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE<br>
--CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \<br>
-- -I/usr/include/ffmpeg \<br>
-- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \<br>
-- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat<br>
-+CFLAGS += -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \<br>
-+ -I=/usr/include/ffmpeg \<br>
-+ -I=/usr/include/libavutil -I=/usr/include/libavcodec -I=/usr/include/libavformat \<br>
-+ -I=/usr/include/ffmpeg/libavutil -I=/usr/include/ffmpeg/libavcodec -I=/usr/include/ffmpeg/libavformat<br>
- #STATIC_LINKING: CFLAGS += -DSTATIC<br>
- #STATIC_LINKING: LDFLAGS = -static<br>
--CC = gcc<br>
-+CC ?= gcc<br>
- RM = rm -f<br>
- INSTALL = install<br>
-<br>
-@@ -64,7 +64,7 @@<br>
- $(INSTALL) -d $(ETCINSTALLDIR)<br>
- $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)<br>
-<br>
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)<br>
-+minidlna: $(BASEOBJS) $(LNXOBJS)<br>
- @echo Linking $@<br>
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)<br>
-<br>
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch<br>
deleted file mode 100644<br>
index 573d88c..0000000<br>
--- a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch<br>
+++ /dev/null<br>
@@ -1,48 +0,0 @@<br>
-Search for headers in STAGING_DIR_GOST.<br>
-<br>
-Upstream-status: Pending<br>
-Signed-off-by: Andrei Gherzan <<a href="mailto:andrei@gherzan.ro">andrei@gherzan.ro</a>><br>
-<br>
-Index: minidlna-1.0.25/genconfig.sh<br>
-===================================================================<br>
---- minidlna-1.0.25.orig/genconfig.sh 2012-01-21 02:34:13.000000000 +0200<br>
-+++ minidlna-1.0.25/genconfig.sh 2013-02-10 17:12:06.000000000 +0200<br>
-@@ -40,22 +40,22 @@<br>
-<br>
- # Detect if there are missing headers<br>
- # NOTE: This check only works with a normal distro<br>
--[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"<br>
--[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"<br>
--[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"<br>
--[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"<br>
--[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"<br>
--[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"<br>
--[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"<br>
--[ ! -e "/usr/include/ffmpeg/avutil.h" -a \<br>
-- ! -e "/usr/include/libavutil/avutil.h" -a \<br>
-- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"<br>
--[ ! -e "/usr/include/ffmpeg/avformat.h" -a \<br>
-- ! -e "/usr/include/libavformat/avformat.h" -a \<br>
-- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"<br>
--[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \<br>
-- ! -e "/usr/include/libavcodec/avcodec.h" -a \<br>
-- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avutil.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/libavutil/avutil.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avformat.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/libavformat/avformat.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"<br>
-+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avcodec.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/libavcodec/avcodec.h" -a \<br>
-+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"<br>
- if [ -n "$MISSING" ]; then<br>
- echo -e "\nERROR! Cannot continue."<br>
- echo -e "The following required libraries are either missing, or are missing development headers:\n"<br>
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/<a href="http://minidlna_1.0.25.bb" target="_blank">minidlna_1.0.25.bb</a> b/meta-oe/recipes-multimedia/nonworking/minidlna/<a href="http://minidlna_1.0.25.bb" target="_blank">minidlna_1.0.25.bb</a><br>
deleted file mode 100644<br>
index 9264bc2..0000000<br>
--- a/meta-oe/recipes-multimedia/nonworking/minidlna/<a href="http://minidlna_1.0.25.bb" target="_blank">minidlna_1.0.25.bb</a><br>
+++ /dev/null<br>
@@ -1,19 +0,0 @@<br>
-DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \<br>
-being fully compliant with DLNA/UPnP-AV clients."<br>
-LICENSE = "GPL-2.0"<br>
-LIC_FILES_CHKSUM = "file://LICENCE;md5=b1a795ac1a06805cf8fd74920bc46b5c"<br>
-<br>
-DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag"<br>
-<br>
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}_${PV}_src.tar.gz \<br>
- file://search-for-headers-in-staging-dir.patch \<br>
- file://fix-makefile.patch \<br>
-"<br>
-<br>
-SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"<br>
-SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"<br>
-<br>
-export STAGING_DIR_HOST<br>
-<br>
-inherit autotools<br>
-<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.1.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>