Skip to contentSkip to conversation

minidlna: new package

PATCH New spdawson at gmail.com 2 participants 3 messages May 6, 2013 – Jul 11, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 minidlna: new package

From: Simon Dawson <[email protected]>

---
 package/Config.in                                  |  1 +
 package/minidlna/Config.in                         | 22 +++++
 .../minidlna-0001-fix-genconfig-script.patch       | 95 ++++++++++++++++++++++
 package/minidlna/minidlna-0002-fix-Makefile.patch  | 20 +++++
 .../minidlna-0003-fix-missing-include.patch        | 19 +++++
 .../minidlna-0004-fix-libavformat-use.patch        | 20 +++++
 package/minidlna/minidlna.mk                       | 44 ++++++++++
 7 files changed, 221 insertions(+)
 create mode 100644 package/minidlna/Config.in
 create mode 100644 package/minidlna/minidlna-0001-fix-genconfig-script.patch
 create mode 100644 package/minidlna/minidlna-0002-fix-Makefile.patch
 create mode 100644 package/minidlna/minidlna-0003-fix-missing-include.patch
 create mode 100644 package/minidlna/minidlna-0004-fix-libavformat-use.patch
 create mode 100644 package/minidlna/minidlna.mk
package/Config.in +1 -0
index 3537de1..6733f23 100644
@@ -706,6 +706,7 @@ source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
+source "package/minidlna/Config.in"
 source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
package/minidlna/Config.in new file +22 -0
new file mode 100644
index 0000000..a3469e7
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_MINIDLNA
+	bool "minidlna"
+	depends on BR2_LARGEFILE # ffmpeg
+	depends on BR2_INET_IPV6 # ffmpeg
+	depends on BR2_USE_MMU # fork
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FLAC
+	select BR2_PACKAGE_LIBVORBIS # selects libogg
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBID3TAG # selects zlib
+	select BR2_PACKAGE_LIBEXIF
+	select BR2_PACKAGE_LIBJPEG
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_HOST_XUTIL_MAKEDEPEND
+	help
+	  MiniDLNA (aka ReadyDLNA) is server software with the aim of being
+	  fully compliant with DLNA/UPnP-AV clients.
+
+	  http://minidlna.sourceforge.net/
+
+comment "minidlna requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
package/minidlna/minidlna-0001-fix-genconfig-script.patch new file +95 -0

95 lines not on this page · raw message

package/minidlna/minidlna-0002-fix-Makefile.patch new file +20 -0
new file mode 100644
index 0000000..7d9867d
@@ -0,0 +1,20 @@
+Fix the Makefile.
+
+N.B. The upstream CVS HEAD has been converted to GNU autotools, but a
+tarball has not yet been released. When the next release tarball is made
+available, this patch can be removed.
+
+Signed-off-by: Simon Dawson <[email protected]>
+
+diff -Nurp a/Makefile b/Makefile
+--- a/Makefile	2012-01-17 22:49:01.000000000 +0000
++++ b/Makefile	2013-05-04 22:29:19.947073948 +0100
+@@ -64,7 +64,7 @@ install-conf:
+ 	$(INSTALL) -d $(ETCINSTALLDIR)
+ 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
+ 
+-minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
++minidlna:	$(BASEOBJS) $(LNXOBJS)
+ 	@echo Linking $@
+ 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
+ 
package/minidlna/minidlna-0003-fix-missing-include.patch new file +19 -0
new file mode 100644
index 0000000..124b0da
@@ -0,0 +1,19 @@
+Fix a missing header include, required for S_ISVTX et al.
+
+N.B. This change is in the upstream CVS HEAD, but is not in the latest
+released tarball. When the next release tarball is made available, this
+patch can be removed.
+
+Signed-off-by: Simon Dawson <[email protected]>
+
+diff -Nurp a/minidlna.c b/minidlna.c
+--- a/minidlna.c	2012-05-08 01:10:42.000000000 +0100
++++ b/minidlna.c	2013-05-04 21:28:35.372717737 +0100
+@@ -57,6 +57,7 @@
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <signal.h>
package/minidlna/minidlna-0004-fix-libavformat-use.patch new file +20 -0
new file mode 100644
index 0000000..a51262d
@@ -0,0 +1,20 @@
+Work around a broken test for libavformat version.
+
+N.B. This change is in the upstream CVS HEAD, but is not in the latest
+released tarball. When the next release tarball is made available, this
+patch can be removed.
+
+Signed-off-by: Simon Dawson <[email protected]>
+
+diff -Nurp a/metadata.c b/metadata.c
+--- a/metadata.c	2012-06-29 22:11:29.000000000 +0100
++++ b/metadata.c	2013-05-04 22:22:47.128202396 +0100
+@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch
+ static inline void
+ lav_close(AVFormatContext *ctx)
+ {
+-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
++#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+ 	avformat_close_input(&ctx);
+ #else
+ 	av_close_input_file(ctx);
package/minidlna/minidlna.mk new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 minidlna: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"spdawson" == spdawson <[email protected]> writes:

spdawson> From: Simon Dawson <[email protected]> spdawson> Signed-off-by: Simon Dawson <[email protected]>

spdawson> +config BR2_PACKAGE_MINIDLNA
spdawson> + bool "minidlna"
spdawson> + depends on BR2_LARGEFILE # ffmpeg
spdawson> + depends on BR2_INET_IPV6 # ffmpeg
spdawson> + depends on BR2_USE_MMU # fork
spdawson> + select BR2_PACKAGE_FFMPEG
spdawson> + select BR2_PACKAGE_FLAC
spdawson> + select BR2_PACKAGE_LIBVORBIS # selects libogg
spdawson> + select BR2_PACKAGE_LIBOGG
spdawson> + select BR2_PACKAGE_LIBID3TAG # selects zlib
spdawson> + select BR2_PACKAGE_LIBEXIF
spdawson> + select BR2_PACKAGE_LIBJPEG
spdawson> + select BR2_PACKAGE_SQLITE
spdawson> + select BR2_PACKAGE_HOST_XUTIL_MAKEDEPEND

We don't have such a host symbol and don't select host packages (except for the few we have under Host Utilities.

spdawson> +++ b/package/minidlna/minidlna-0002-fix-Makefile.patch spdawson> @@ -0,0 +1,20 @@
spdawson> +Fix the Makefile.
spdawson> +
spdawson> +N.B. The upstream CVS HEAD has been converted to GNU autotools, but a spdawson> +tarball has not yet been released. When the next release tarball is made spdawson> +available, this patch can be removed.
spdawson> +
spdawson> +Signed-off-by: Simon Dawson <[email protected]>
spdawson> +
spdawson> +diff -Nurp a/Makefile b/Makefile
spdawson> +--- a/Makefile 2012-01-17 22:49:01.000000000 +0000
spdawson> ++++ b/Makefile 2013-05-04 22:29:19.947073948 +0100
spdawson> +@@ -64,7 +64,7 @@ install-conf:
spdawson> + $(INSTALL) -d $(ETCINSTALLDIR)
spdawson> + $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
spdawson> +
spdawson> +-minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
spdawson> ++minidlna: $(BASEOBJS) $(LNXOBJS)

'Fix the Makefile' is not very descriptive.

spdawson> +++ b/package/minidlna/minidlna.mk
spdawson> @@ -0,0 +1,44 @@
spdawson> +#############################################################
spdawson> +#
spdawson> +# minidlna
spdawson> +#
spdawson> +#############################################################
spdawson> +
spdawson> +MINIDLNA_VERSION = 1.0.25
spdawson> +MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
spdawson> +MINIDLNA_SOURCE = minidlna_$(MINIDLNA_VERSION)_src.tar.gz
spdawson> +MINIDLNA_LICENSE = GPLv2+ BSD-3c

LICENCE explicitly states:

Version 2 is the only version of this license which this version of MiniDLNA (or modified versions derived from this one) may be distributed under.

So it is GPLv2, not GPLv2+.

spdawson> +MINIDLNA_LICENSE_FILES = LICENSE LICENCE.miniupnpd

The first license file is called LICENCE.

spdawson> +
spdawson> +MINIDLNA_DEPENDENCIES = \
spdawson> + ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \
spdawson> + host-xutil_makedepend
spdawson> +
spdawson> +MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
spdawson> + -I"$(STAGING_DIR)/usr/include" \
spdawson> + -I"$(STAGING_DIR)/usr/include/libavutil" \
spdawson> + -I"$(STAGING_DIR)/usr/include/libavcodec" \
spdawson> + -I"$(STAGING_DIR)/usr/include/libavformat"

The compiler already looks in STAGING_DIR/usr/include, so the first line can get dropped.

Committed with these fixes, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 minidlna: new package

Hi Peter.

Quoted 1 line · Peter Korsgaard

Committed with these fixes, thanks.

Thanks for your work on this.

Simon.