minidlna, bump version (#7419)

This commit is contained in:
Schrijvers Luc
2022-11-16 09:32:16 +01:00
committed by GitHub
parent b357f96d67
commit b852a80e9f
2 changed files with 43 additions and 15 deletions

View File

@@ -6,9 +6,9 @@ HOMEPAGE="http://minidlna.sourceforge.net/
COPYRIGHT="2008-2017 Justin Maggard"
LICENSE="GNU GPL v2
BSD (3-clause)"
REVISION="6"
REVISION="1"
SOURCE_URI="https://downloads.sourceforge.net/minidlna/minidlna-$portVersion.tar.gz"
CHECKSUM_SHA256="67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec"
CHECKSUM_SHA256="222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0"
PATCHES="minidlna-$portVersion.patchset"
ARCHITECTURES="?all !x86_gcc2"
@@ -46,6 +46,7 @@ REQUIRES="
lib:libssl$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisfile$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
@@ -92,3 +93,8 @@ INSTALL()
make install
cp minidlna.conf $settingsDir
}
TEST()
{
make check
}

View File

@@ -1,14 +1,14 @@
From 6cd0b4ad820a64be84944be49d8848d537d823c9 Mon Sep 17 00:00:00 2001
From dea96119ca20423d8c72b5c8e0eb099eeb47b311 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 29 Apr 2018 17:23:23 +0200
Subject: Haiku doesn't have setpriority nor d_type
diff --git a/monitor.c b/monitor.c
index b3a17f5..a4cf7a2 100644
index edbe308..9f515c9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -533,6 +533,7 @@ monitor_insert_directory(int fd, char *name, const char * path)
@@ -341,6 +341,7 @@ monitor_insert_directory(int fd, char *name, const char * path)
continue;
esc_name = escape_tag(e->d_name, 1);
snprintf(path_buf, sizeof(path_buf), "%s/%s", path, e->d_name);
@@ -16,7 +16,7 @@ index b3a17f5..a4cf7a2 100644
switch( e->d_type )
{
case DT_DIR:
@@ -543,6 +544,9 @@ monitor_insert_directory(int fd, char *name, const char * path)
@@ -351,6 +352,9 @@ monitor_insert_directory(int fd, char *name, const char * path)
default:
break;
}
@@ -27,7 +27,7 @@ index b3a17f5..a4cf7a2 100644
{
monitor_insert_directory(fd, esc_name, path_buf);
diff --git a/scanner.c b/scanner.c
index a730567..2c2ad43 100644
index f240a2f..4000ac7 100644
--- a/scanner.c
+++ b/scanner.c
@@ -897,7 +897,9 @@ start_scanner(void)
@@ -41,10 +41,10 @@ index a730567..2c2ad43 100644
setlocale(LC_COLLATE, "");
diff --git a/upnphttp.c b/upnphttp.c
index 3b4b58a..3381863 100644
index 05b2020..5d9735b 100644
--- a/upnphttp.c
+++ b/upnphttp.c
@@ -1760,10 +1760,12 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
@@ -1821,10 +1821,12 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
INIT_STR(str, header);
@@ -57,7 +57,7 @@ index 3b4b58a..3381863 100644
#endif
tmode = "Interactive";
start_dlna_header(&str, 200, tmode, "image/jpeg");
@@ -1980,10 +1982,12 @@ SendResp_dlnafile(struct upnphttp *h, char *object)
@@ -2041,10 +2043,12 @@ SendResp_dlnafile(struct upnphttp *h, char *object)
INIT_STR(str, header);
@@ -71,20 +71,20 @@ index 3b4b58a..3381863 100644
if( strncmp(last_file.mime, "image", 5) == 0 )
tmode = "Interactive";
--
2.16.4
2.37.3
From f28a08d22ba34e6286cc543e21a7f59e78daf793 Mon Sep 17 00:00:00 2001
From e92b704b7f9e174fa0ddbd375fe255ec696d1559 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 24 Jun 2018 07:06:37 +0200
Subject: set correct path for the conf file
diff --git a/minidlna.c b/minidlna.c
index 10b4806..2d95bfa 100644
index 999adee..277029c 100644
--- a/minidlna.c
+++ b/minidlna.c
@@ -499,7 +499,7 @@ init(int argc, char **argv)
@@ -548,7 +548,7 @@ init(int argc, char **argv)
int options_flag = 0;
struct sigaction sa;
const char * presurl = NULL;
@@ -94,5 +94,27 @@ index 10b4806..2d95bfa 100644
char *string, *word;
char *path;
--
2.16.4
2.37.3
From 6c6c58d88598be5dd2d6ed8b4cb02cd28825a2e7 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 16 Nov 2022 08:04:10 +0100
Subject: libav-fix patch (from Alpine Linux)
diff --git a/Makefile.am b/Makefile.am
index 1e33833..dcfc625 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,6 @@ testupnpdescgen_LDADD = \
@LIBID3TAG_LIBS@ \
@LIBSQLITE3_LIBS@ \
@LIBAVFORMAT_LIBS@ \
- @LIBAVUTIL_LIBS@ \
@LIBEXIF_LIBS@ \
-lFLAC $(flacogglibs) $(vorbislibs) $(avahilibs)
--
2.37.3