From 00331d16b7042e1f0616b886250317608b3a63d0 Mon Sep 17 00:00:00 2001 From: Markham Date: Fri, 12 Oct 2018 13:02:03 +0200 Subject: [PATCH] fix minidlna target and use it for hd51 --- archive-patches/minidlna-1.1.5.patch | 13 +++++++++++++ make/archives.mk | 3 +++ make/libraries.mk | 20 ++++++-------------- make/neutrino.mk | 1 + make/versions.mk | 3 +++ 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 archive-patches/minidlna-1.1.5.patch diff --git a/archive-patches/minidlna-1.1.5.patch b/archive-patches/minidlna-1.1.5.patch new file mode 100644 index 0000000..408268b --- /dev/null +++ b/archive-patches/minidlna-1.1.5.patch @@ -0,0 +1,13 @@ +--- a/minidlna.c ++++ b/minidlna.c +@@ -295,10 +295,8 @@ + 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;"); + + return new_db; + } diff --git a/make/archives.mk b/make/archives.mk index bf1eeb2..093a7db 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -261,6 +261,9 @@ $(ARCHIVE)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2: $(ARCHIVE)/libexif-$(LIBEXIF_VER).tar.gz: $(WGET) https://sourceforge.net/projects/libexif/files/libexif/$(LIBEXIF_VER)/libexif-$(LIBEXIF_VER).tar.gz +$(ARCHIVE)/minidlna-$(MINIDLNA_VER).tar.gz: + $(WGET) https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VER)/minidlna-$(MINIDLNA_VER).tar.gz + $(ARCHIVE)/mjpg-streamer-r63.tar.gz: $(WGET) http://www.fhloston-paradise.de/mjpg-streamer-r63.tar.gz diff --git a/make/libraries.mk b/make/libraries.mk index f4feac0..97d2330 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -781,25 +781,17 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz | $(TARGETPREFIX) # # minidlna # -MINIDLNA_VER = 1.1.5 -MINIDLNA_SOURCE = minidlna-$(MINIDLNA_VER).tar.gz -MINIDLNA_PATCH = minidlna-$(MINIDLNA_VER).patch - -$(ARCHIVE)/$(MINIDLNA_SOURCE): - $(WGET) https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VER)/$(MINIDLNA_SOURCE) - -$(D)/minidlna: $(D)/bootstrap $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $(D)/libogg $(D)/libvorbis $(D)/flac $(D)/ffmpeg $(ARCHIVE)/$(MINIDLNA_SOURCE) +$(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $(D)/libogg $(D)/libvorbis $(D)/flac $(D)/ffmpeg $(ARCHIVE)/minidlna-$(MINIDLNA_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) - $(REMOVE)/minidlna-$(MINIDLNA_VER) - $(UNTAR)/$(MINIDLNA_SOURCE) + $(UNTAR)/minidlna-$(MINIDLNA_VER).tar.gz set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \ - $(call apply_patches,$(MINIDLNA_PATCH)); \ - autoreconf -fi $(SILENT_OPT); \ + $(PATCH)/minidlna-$(MINIDLNA_VER).patch; \ + autoreconf -fi; \ $(CONFIGURE) \ - --prefix=/usr \ + --prefix=/ \ ; \ $(MAKE); \ - $(MAKE) install prefix=/usr DESTDIR=$(TARGET_DIR) + $(MAKE) install prefix=/ DESTDIR=$(TARGETPREFIX) $(REMOVE)/minidlna-$(MINIDLNA_VER) $(TOUCH) diff --git a/make/neutrino.mk b/make/neutrino.mk index 0560348..e8f106a 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -92,6 +92,7 @@ ifeq ($(BOXTYPE), armbox) endif ifeq ($(BOXTYPE), armbox) NEUTRINO_DEPS += $(D)/mc +NEUTRINO_DEPS += $(D)/minidlna endif ifeq ($(BOXSERIES), hd2) NEUTRINO_DEPS += $(D)/mc diff --git a/make/versions.mk b/make/versions.mk index c0c6a22..2a68dd9 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -160,6 +160,9 @@ LUASOCKET_GIT = 5a17f79 # Midnight Commander MC_VER = 4.8.21 +# mini-DLNA +MINIDLNA_VER = 1.1.5 + # mtd-utils for the host and target MTD_UTILS_VER = 1.5.2 -- 2.39.5