[oe] [meta-oe][PATCH v3] minidlna: restore & fix recipe

2018-09-11 Thread Baptiste Durand 
Restore minidlna recipe and bump it to v1.2.1
Move it to meta-multimedia
Signed-off-by: Baptiste Durand 
---
 .../recipes-multimedia/minidlna/minidlna.inc  | 41 +++
 .../0001-Update-Gettext-version.patch | 34 +++
 .../minidlna/minidlna/minidlna-daemon.init.d  |  0
 .../minidlna/minidlna/minidlna.service|  0
 .../minidlna/minidlna_1.2.1.bb|  4 ++
 5 files changed, 79 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
 rename {meta-oe => 
meta-multimedia}/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
(100%)
 rename {meta-oe => 
meta-multimedia}/recipes-multimedia/minidlna/minidlna/minidlna.service (100%)
 create mode 100644 
meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb

diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 0..187ff536a
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients."
+LICENSE = "GPL-2.0|BSD"
+DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"
+
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = "commercial"
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+   file://minidlna-daemon.init.d \
+   file://minidlna.service \
+   file://0001-Update-Gettext-version.patch \
+   "
+
+S = "${WORKDIR}/git"
+
+# This remove "--exclude=autopoint" option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = ""
+
+do_install_append(){
+install -d ${D}${sysconfdir}
+install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+install -d ${D}${nonarch_base_libdir}/systemd/system
+install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+install -d ${D}${sysconfdir}/init.d
+install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = "minidlna.service"
+
+INITSCRIPT_NAME = "minidlna"
+INITSCRIPT_PARAMS = "defaults 90"
+
diff --git 
a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
new file mode 100644
index 0..c18095d42
--- /dev/null
+++ 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
@@ -0,0 +1,34 @@
+From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001
+From: Baptiste Durand 
+Date: Sun, 9 Sep 2018 20:50:41 +0200
+Subject: [PATCH] Update Gettext version
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Baptiste Durand 
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f343d21..a556b33 100644
+--- a/configure.ac
 b/configure.ac
+@@ -14,7 +14,7 @@
+ # License along with MiniDLNA; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+-AC_INIT(MiniDLNA,1.1.3,,minidlna)
++AC_INIT(MiniDLNA,1.2.1,,minidlna)
+ #LT_INIT
+ 
+ AC_CANONICAL_TARGET
+@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], 
[AC_USE_SYSTEM_EXTENSIONS])
+ 
+ AM_ICONV
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION(0.18)
++AM_GNU_GETTEXT_VERSION(0.19)
+ 
+ # Checks for programs.
+ AC_PROG_AWK
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
similarity index 100%
rename from meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
rename to 
meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna.service
similarity index 100%
rename from meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
rename to meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna.service
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb 
b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb
new file mode 100644
index 0..999d85ce7
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRCREV = "c760

[oe] [meta-oe][PATCH v2] minidlna: restore & fix recipe

2018-09-10 Thread Baptiste Durand 
Restore minidlna recipe and bump it to v1.2.1

Signed-off-by: Baptiste Durand 
---
 .../recipes-multimedia/minidlna/minidlna.inc  | 41 +++
 .../0001-Update-Gettext-version.patch | 34 +++
 .../minidlna/minidlna_1.2.1.bb|  4 ++
 3 files changed, 79 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 0..187ff536a
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients."
+LICENSE = "GPL-2.0|BSD"
+DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"
+
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = "commercial"
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+   file://minidlna-daemon.init.d \
+   file://minidlna.service \
+   file://0001-Update-Gettext-version.patch \
+   "
+
+S = "${WORKDIR}/git"
+
+# This remove "--exclude=autopoint" option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = ""
+
+do_install_append(){
+install -d ${D}${sysconfdir}
+install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+install -d ${D}${nonarch_base_libdir}/systemd/system
+install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+install -d ${D}${sysconfdir}/init.d
+install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = "minidlna.service"
+
+INITSCRIPT_NAME = "minidlna"
+INITSCRIPT_PARAMS = "defaults 90"
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
 
b/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
new file mode 100644
index 0..c18095d42
--- /dev/null
+++ 
b/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
@@ -0,0 +1,34 @@
+From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001
+From: Baptiste Durand 
+Date: Sun, 9 Sep 2018 20:50:41 +0200
+Subject: [PATCH] Update Gettext version
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Baptiste Durand 
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f343d21..a556b33 100644
+--- a/configure.ac
 b/configure.ac
+@@ -14,7 +14,7 @@
+ # License along with MiniDLNA; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+-AC_INIT(MiniDLNA,1.1.3,,minidlna)
++AC_INIT(MiniDLNA,1.2.1,,minidlna)
+ #LT_INIT
+ 
+ AC_CANONICAL_TARGET
+@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], 
[AC_USE_SYSTEM_EXTENSIONS])
+ 
+ AM_ICONV
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION(0.18)
++AM_GNU_GETTEXT_VERSION(0.19)
+ 
+ # Checks for programs.
+ AC_PROG_AWK
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
new file mode 100644
index 0..fe6bebce2
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRCREV = "v1_2_1"
+LIC_FILES_CHKSUM = 
"file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][PATCH] minidlna: 1.1.4 -> 1.1.5

2016-02-18 Thread Baptiste DURAND 
Upgrade minidlna from 1.1.4 to 1.1.5

Signed-off-by: Baptiste DURAND <baptiste.dur...@gmail.com>
---
 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 --
 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb | 4 
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
deleted file mode 100644
index 0531e69..000
--- a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "v1_1_4"
-LIC_FILES_CHKSUM = 
"file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
-SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
-SRC_URI[sha256sum] = 
"170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb
new file mode 100644
index 000..7c6db62
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRCREV = "v1_1_5"
+LIC_FILES_CHKSUM = 
"file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
-- 
2.5.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][PATCH v2] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste DURAND 
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
 meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
 .../minidlna/minidlna/minidlna-daemon.init.d   | 54 ++
 .../minidlna/minidlna/minidlna.service | 10 
 .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
 .../minidlna/minidlna/fix-makefile.patch   | 41 
 .../search-for-headers-in-staging-dir.patch| 48 ---
 .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
 7 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..49e23cc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg 
libid3tag libvorbis
+
+inherit autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+file://minidlna-daemon.init.d
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd', 
'file://minidlna.service', '', d)}
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid 
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = 
+
+do_install_initd() {
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+   install -d ${D}${nonarch_base_libdir}/systemd/system
+   install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+   install -d ${D}${sysconfdir}
+   install -m 0755 minidlna.conf ${D}${sysconfdir}
+   do_install_initd
+   ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd', 
'', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according 
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+ 
+pid=$!
+
+if [ $pid !=  ]; then
+echo -n $pid  ${PIDFILE}
+fi
+} 
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM = 
file://LICENCE.miniupnpd;md5

Re: [oe] [meta-oe][PATCH] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste Durand 
Thanks for your comment , I will resend a updated patch according to it.
Regards,

Baptiste


2015-03-05 9:14 GMT+01:00 Andreas Oberritter o...@opendreambox.org:

 Hello Baptiste,

 On 04.03.2015 13:56, Baptiste DURAND wrote:
  Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
  ---
   meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
   .../minidlna/minidlna/minidlna-daemon.init.d   | 54
 ++
   .../minidlna/minidlna/minidlna-daemon.service  | 10 
   .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
   .../minidlna/minidlna/fix-makefile.patch   | 41 
   .../search-for-headers-in-staging-dir.patch| 48
 ---
   .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
   7 files changed, 109 insertions(+), 108 deletions(-)
   create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
   create mode 100644 meta-oe/recipes-multimedia/minidlna/
 minidlna_1.1.4.bb
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
   delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
 minidlna_1.0.25.bb
 
  diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
 b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  new file mode 100644
  index 000..9d6568d
  --- /dev/null
  +++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  @@ -0,0 +1,39 @@
  +DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim
 of \
  +being fully compliant with DLNA/UPnP-AV clients.
  +LICENSE = GPL-2.0|BSD
  +DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif
 libogg libid3tag libvorbis
  +
  +inherit autotools update-rc.d systemd
  +
  +SRC_URI = git://
 git.code.sf.net/p/minidlna/git;branch=master;module=git
  +SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd',
 'file://minidlna-daemon.service', 'file://minidlna-daemon.init.d', d)}

 DISTRO_FEATUES may contain both systemd and sysvinit at the same time.

  +
  +S = ${WORKDIR}/git
  +B = ${S}

 inherit autotools-brokensep instead of setting B.

  +
  +do_configure_prepend() {
  +cd ${S}
  +./autogen.sh
  +}

 Is this required?

  +
  +do_install_initd() {
  + install -d ${D}${sysconfdir}/init.d
  + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
 ${D}${sysconfdir}/init.d/minidlna
  +}
  +
  +do_install_systemd() {
  + install -d ${D}${nonarch_base_libdir}/systemd/system
  + install -m 0755 ${WORKDIR}/minidlna-daemon.service
 ${D}${nonarch_base_libdir}/systemd/system
  +}
  +
  +do_install_append(){
  + install -d ${D}${sysconfdir}
  + install -m 0755 minidlna.conf ${D}${sysconfdir}
  + ${@base_contains('DISTRO_FEATURES', 'systemd',
 'do_install_systemd', 'do_install_initd', d)}
  +}
  +
  +SYSTEMD_SERVICE_${PN} = minidlna-daemon.service
  +
  +INITSCRIPT_NAME = minidlna
  +INITSCRIPT_PARAMS = defaults 90

 If the systemd unit had the same basename as the init script, i.e.
 minidlna.service, then systemd would be able to ignore the init script
 automatically.

 Regards,
 Andreas

  +
  diff --git
 a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  new file mode 100644
  index 000..61b5b54
  --- /dev/null
  +++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  @@ -0,0 +1,54 @@
  +#!/bin/sh
  +
  +NAME=minidlna
  +DAEMON=/usr/sbin/minidlnad
  +SCRIPTNAME=/etc/init.d/$NAME
  +PIDFILE=/var/run/$NAME.pid
  +CONF=/etc/$NAME.conf
  +ARGS=-f $CONF
  +
  +# Exit if the package is not installed
  +[ -x $DAEMON ] || exit 0
  +
  +start_function() {
  +
  +export PATH=$PWD:$PATH
  +
  +if [ -f ${PIDFILE} ]; then
  +echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
 according to ${PIDFILE} );
  +exit 0
  +fi
  +
  +$DAEMON $ARGS
  +
  +pid=$!
  +
  +if [ $pid !=  ]; then
  +echo -n $pid  ${PIDFILE}
  +fi
  +}
  +
  +stop_function() {
  +
  +export PATH=$PWD:$PATH
  +
  +if [ ! -e ${PIDFILE} ]; then
  +echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
  +exit 1;
  +fi
  +PID=`cat ${PIDFILE}`
  +kill -INT ${PID}
  +rm -f ${PIDFILE}
  +}
  +
  +case $1 in
  +start)
  +start_function
  +;;
  +stop)
  +stop_function
  +;;
  +*)
  +echo Usage: $0 {start | stop}
  +
  +esac
  diff --git
 a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
 b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
  new file mode 100644
  index 000..656100b

[oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste DURAND 
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
 meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 36 +++
 .../minidlna/minidlna/minidlna-daemon.init.d   | 54 ++
 .../minidlna/minidlna/minidlna.service | 10 
 .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
 .../minidlna/minidlna/fix-makefile.patch   | 41 
 .../search-for-headers-in-staging-dir.patch| 48 ---
 .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
 7 files changed, 106 insertions(+), 108 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+   file://minidlna-daemon.init.d \
+   file://minidlna.service 
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = 
+
+do_install_append(){
+   install -d ${D}${sysconfdir}
+   install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+   install -d ${D}${nonarch_base_libdir}/systemd/system
+   install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according 
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+ 
+pid=$!
+
+if [ $pid !=  ]; then
+echo -n $pid  ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM = 
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] = d966256baf2f9b068b9de871ab5dade5
+SRC_URI[sha256sum] = 
170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851
diff --git 
a/meta-oe/recipes-multimedia

Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste Durand 
Sorry Martin

I have just seen your recent change on mplayer2 recipes.
http://cgit.openembedded.org/meta-openembedded/commit/?h=master-nextid=522ee507725c0e5300af1856c481e93938be313f

You probably means LICENSE_FLAGS not LICENSE_FLAGS_WHITELIST

I will resend an update


2015-03-05 15:30 GMT+01:00 Baptiste Durand baptiste.dur...@gmail.com:



 2015-03-05 14:18 GMT+01:00 Martin Jansa martin.ja...@gmail.com:

 On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
  Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
  Signed-off-by: Martin Jansa martin.ja...@gmail.com
  ---
   meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 36 +++
   .../minidlna/minidlna/minidlna-daemon.init.d   | 54
 ++
   .../minidlna/minidlna/minidlna.service | 10 
   .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
   .../minidlna/minidlna/fix-makefile.patch   | 41
 
   .../search-for-headers-in-staging-dir.patch| 48
 ---
   .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
   7 files changed, 106 insertions(+), 108 deletions(-)
   create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
   create mode 100644 meta-oe/recipes-multimedia/minidlna/
 minidlna_1.1.4.bb
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
   delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
 minidlna_1.0.25.bb
 
  diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
 b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  new file mode 100644
  index 000..f553acb
  --- /dev/null
  +++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  @@ -0,0 +1,36 @@
  +DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the
 aim of \
  +being fully compliant with DLNA/UPnP-AV clients.
  +LICENSE = GPL-2.0|BSD
  +DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag
 libvorbis

 Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise
 the build
 will fail with:

 ERROR: Nothing PROVIDES 'libav' (but
 meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on
 or otherwise requires it)
 ERROR: libav was skipped: because it has a restricted license not
 whitelisted in LICENSE_FLAGS_WHITELIST



 Hello Martin
 I'm not sure to understand what do you mean exactly :S

 I thought this variable (LICENSE_FLAGS_WHITELIST)  should be used only in
 distro configuration or local.conf, not in a recipe.


 The purpose of this varaibel is to be able to build rootfs with or without
 commercial packages, is it correct?

 In my point of view , setting this variable to the value commercial
 directly in a recipe is not a good idea.


 BR

 Baptiste



  +
  +inherit gettext autotools-brokensep update-rc.d systemd
  +
  +SRC_URI = git://
 git.code.sf.net/p/minidlna/git;branch=master;module=git \
  +   file://minidlna-daemon.init.d \
  +   file://minidlna.service 
  +
  +S = ${WORKDIR}/git
  +
  +# This remove --exclude=autopoint option from autoreconf argument to
 avoid
  +# configure.ac:30: error: required file './ABOUT-NLS' not found
  +EXTRA_AUTORECONF = 
  +
  +do_install_append(){
  + install -d ${D}${sysconfdir}
  + install -m 0755 minidlna.conf ${D}${sysconfdir}
  +
  +# Systemd script
  + install -d ${D}${nonarch_base_libdir}/systemd/system
  + install -m 0755 ${WORKDIR}/minidlna.service
 ${D}${nonarch_base_libdir}/systemd/system
  +
  +# Sysvinit script
  + install -d ${D}${sysconfdir}/init.d
  + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
 ${D}${sysconfdir}/init.d/minidlna
  +
  +}
  +
  +SYSTEMD_SERVICE_${PN} = minidlna.service
  +
  +INITSCRIPT_NAME = minidlna
  +INITSCRIPT_PARAMS = defaults 90
  +
  diff --git
 a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  new file mode 100644
  index 000..9e64a20
  --- /dev/null
  +++
 b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  @@ -0,0 +1,54 @@
  +#!/bin/sh
  +
  +NAME=minidlna
  +DAEMON=/usr/sbin/minidlnad
  +SCRIPTNAME=/etc/init.d/$NAME
  +PIDFILE=/var/run/$NAME.pid
  +CONF=/etc/$NAME.conf
  +ARGS=-f $CONF
  +
  +# Exit if the package is not installed
  +[ -x $DAEMON ] || exit 0
  +
  +start_function() {
  +
  +export PATH=$PWD:$PATH
  +
  +if [ -f ${PIDFILE} ]; then
  +echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
 according to ${PIDFILE} );
  +exit 0
  +fi
  +
  +$DAEMON $ARGS
  +
  +pid=$!
  +
  +if [ $pid !=  ]; then
  +echo -n $pid

Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste Durand 
2015-03-05 14:18 GMT+01:00 Martin Jansa martin.ja...@gmail.com:

 On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
  Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
  Signed-off-by: Martin Jansa martin.ja...@gmail.com
  ---
   meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 36 +++
   .../minidlna/minidlna/minidlna-daemon.init.d   | 54
 ++
   .../minidlna/minidlna/minidlna.service | 10 
   .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
   .../minidlna/minidlna/fix-makefile.patch   | 41 
   .../search-for-headers-in-staging-dir.patch| 48
 ---
   .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
   7 files changed, 106 insertions(+), 108 deletions(-)
   create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
   create mode 100644
 meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
   create mode 100644 meta-oe/recipes-multimedia/minidlna/
 minidlna_1.1.4.bb
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
   delete mode 100644
 meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
   delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
 minidlna_1.0.25.bb
 
  diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
 b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  new file mode 100644
  index 000..f553acb
  --- /dev/null
  +++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
  @@ -0,0 +1,36 @@
  +DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim
 of \
  +being fully compliant with DLNA/UPnP-AV clients.
  +LICENSE = GPL-2.0|BSD
  +DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag
 libvorbis

 Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise
 the build
 will fail with:

 ERROR: Nothing PROVIDES 'libav' (but
 meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on
 or otherwise requires it)
 ERROR: libav was skipped: because it has a restricted license not
 whitelisted in LICENSE_FLAGS_WHITELIST



Hello Martin
I'm not sure to understand what do you mean exactly :S

I thought this variable (LICENSE_FLAGS_WHITELIST)  should be used only in
distro configuration or local.conf, not in a recipe.


The purpose of this varaibel is to be able to build rootfs with or without
commercial packages, is it correct?

In my point of view , setting this variable to the value commercial
directly in a recipe is not a good idea.


BR

Baptiste



 +
  +inherit gettext autotools-brokensep update-rc.d systemd
  +
  +SRC_URI = git://
 git.code.sf.net/p/minidlna/git;branch=master;module=git \
  +   file://minidlna-daemon.init.d \
  +   file://minidlna.service 
  +
  +S = ${WORKDIR}/git
  +
  +# This remove --exclude=autopoint option from autoreconf argument to
 avoid
  +# configure.ac:30: error: required file './ABOUT-NLS' not found
  +EXTRA_AUTORECONF = 
  +
  +do_install_append(){
  + install -d ${D}${sysconfdir}
  + install -m 0755 minidlna.conf ${D}${sysconfdir}
  +
  +# Systemd script
  + install -d ${D}${nonarch_base_libdir}/systemd/system
  + install -m 0755 ${WORKDIR}/minidlna.service
 ${D}${nonarch_base_libdir}/systemd/system
  +
  +# Sysvinit script
  + install -d ${D}${sysconfdir}/init.d
  + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
 ${D}${sysconfdir}/init.d/minidlna
  +
  +}
  +
  +SYSTEMD_SERVICE_${PN} = minidlna.service
  +
  +INITSCRIPT_NAME = minidlna
  +INITSCRIPT_PARAMS = defaults 90
  +
  diff --git
 a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  new file mode 100644
  index 000..9e64a20
  --- /dev/null
  +++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
  @@ -0,0 +1,54 @@
  +#!/bin/sh
  +
  +NAME=minidlna
  +DAEMON=/usr/sbin/minidlnad
  +SCRIPTNAME=/etc/init.d/$NAME
  +PIDFILE=/var/run/$NAME.pid
  +CONF=/etc/$NAME.conf
  +ARGS=-f $CONF
  +
  +# Exit if the package is not installed
  +[ -x $DAEMON ] || exit 0
  +
  +start_function() {
  +
  +export PATH=$PWD:$PATH
  +
  +if [ -f ${PIDFILE} ]; then
  +echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
 according to ${PIDFILE} );
  +exit 0
  +fi
  +
  +$DAEMON $ARGS
  +
  +pid=$!
  +
  +if [ $pid !=  ]; then
  +echo -n $pid  ${PIDFILE}
  +fi
  +}
  +
  +stop_function() {
  +
  +export PATH=$PWD:$PATH
  +
  +if [ ! -e ${PIDFILE} ]; then
  +echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
  +exit 1;
  +fi
  +PID=`cat ${PIDFILE}`
  +kill -INT ${PID}
  +rm -f ${PIDFILE}
  +}
  +
  +case $1 in
  +start)
  +start_function

[oe] [meta-oe][PATCH v4] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste DURAND 
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
 meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
 .../minidlna/minidlna/minidlna-daemon.init.d   | 54 ++
 .../minidlna/minidlna/minidlna.service | 10 
 .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
 .../minidlna/minidlna/fix-makefile.patch   | 41 
 .../search-for-headers-in-staging-dir.patch| 48 ---
 .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
 7 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..ebca755
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
+
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = commercial
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+   file://minidlna-daemon.init.d \
+   file://minidlna.service 
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = 
+
+do_install_append(){
+   install -d ${D}${sysconfdir}
+   install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+   install -d ${D}${nonarch_base_libdir}/systemd/system
+   install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according 
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+ 
+pid=$!
+
+if [ $pid !=  ]; then
+echo -n $pid  ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM = 
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] = d966256baf2f9b068b9de871ab5dade5
+SRC_URI[sha256sum

[oe] [meta-oe][PATCH] minidlna: Fix package and bump to version 1.1.4

2015-03-04 Thread Baptiste DURAND 
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
---
 meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
 .../minidlna/minidlna/minidlna-daemon.init.d   | 54 ++
 .../minidlna/minidlna/minidlna-daemon.service  | 10 
 .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
 .../minidlna/minidlna/fix-makefile.patch   | 41 
 .../search-for-headers-in-staging-dir.patch| 48 ---
 .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
 7 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..9d6568d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg 
libid3tag libvorbis
+
+inherit autotools update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd', 
'file://minidlna-daemon.service', 'file://minidlna-daemon.init.d', d)}
+
+S = ${WORKDIR}/git
+B = ${S}
+
+do_configure_prepend() {
+cd ${S}
+./autogen.sh
+}
+
+do_install_initd() {
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+   install -d ${D}${nonarch_base_libdir}/systemd/system
+   install -m 0755 ${WORKDIR}/minidlna-daemon.service 
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+   install -d ${D}${sysconfdir}
+   install -m 0755 minidlna.conf ${D}${sysconfdir}
+   ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd', 
'do_install_initd', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna-daemon.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according 
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+ 
+pid=$!
+
+if [ $pid !=  ]; then
+echo -n $pid  ${PIDFILE}
+fi
+} 
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM = 
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] = d966256baf2f9b068b9de871ab5dade5
+SRC_URI[sha256sum