Hello community,
here is the log from the commit of package minidlna for openSUSE:Factory
checked in at 2020-06-09 00:06:58
Comparing /work/SRC/openSUSE:Factory/minidlna (Old)
and /work/SRC/openSUSE:Factory/.minidlna.new.3606 (New)
Package is "minidlna"
Tue Jun 9 00:06:58 2020 rev:3 rq:812495 version:1.2.1
Changes:
--- /work/SRC/openSUSE:Factory/minidlna/minidlna.changes2018-12-11
15:48:03.346191633 +0100
+++ /work/SRC/openSUSE:Factory/.minidlna.new.3606/minidlna.changes
2020-06-09 00:09:15.326267962 +0200
@@ -1,0 +2,7 @@
+Mon Jun 8 10:51:07 CEST 2020 - r...@suse.de
+
+- add patch minidlna-multiple_definition.patch to fix
+ multiple definition linker errors with recent gcc
+ (from https://706916.bugs.gentoo.org/attachment.cgi?id=641058)
+
+---
New:
minidlna-multiple_definition.patch
Other differences:
--
++ minidlna.spec ++
--- /var/tmp/diff_new_pack.mLTwti/_old 2020-06-09 00:09:16.666272717 +0200
+++ /var/tmp/diff_new_pack.mLTwti/_new 2020-06-09 00:09:16.666272717 +0200
@@ -1,7 +1,7 @@
#
# spec file for package minidlna
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2012 by Lars Vogdt
#
# All modifications and additions to the file contributed by third parties
@@ -33,6 +33,7 @@
Source3:minidlna_logrotate
# VDR FIX thanks to Boris from openSuse
Patch0: minidlna-vdr.diff
+Patch1: minidlna-multiple_definition.patch
#BuildRequires: cvs
BuildRequires: e2fsprogs-devel
BuildRequires: flac-devel
@@ -41,10 +42,10 @@
BuildRequires: libjpeg-devel
BuildRequires: libuuid-devel
BuildRequires: libvorbis-devel
+BuildRequires: sqlite-devel
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
-BuildRequires: sqlite-devel
Requires: logrotate
Requires: sqlite3
Requires(pre): pwdutils
@@ -57,6 +58,7 @@
%prep
%setup -q
%patch0
+%patch1 -p1
%build
#./autogen.sh
++ minidlna-multiple_definition.patch ++
--- minidlna-1.2.1/image_utils.c2020/06/08 08:44:01 1.1
+++ minidlna-1.2.1/image_utils.c2020/06/08 08:45:33
@@ -190,7 +190,7 @@
src->pub.bytes_in_buffer = bufsize;
}
-jmp_buf setjmp_buffer;
+static jmp_buf setjmp_buffer;
/* Don't exit on error like libjpeg likes to do */
static void
libjpeg_error_handler(j_common_ptr cinfo)
--- minidlna-1.2.1/metadata.c 2020/06/08 08:45:39 1.1
+++ minidlna-1.2.1/metadata.c 2020/06/08 08:47:21
@@ -484,7 +484,7 @@
}
/* For libjpeg error handling */
-jmp_buf setjmp_buffer;
+static jmp_buf setjmp_buffer;
static void
libjpeg_error_handler(j_common_ptr cinfo)
{
--- minidlna-1.2.1/tivo_utils.h 2020/06/08 08:47:55 1.1
+++ minidlna-1.2.1/tivo_utils.h 2020/06/08 08:48:08
@@ -30,7 +30,9 @@
unsigned char isInit; /* True if initialized */
unsigned char i, j;/* State variables */
unsigned char s[256]; /* State variables */
-} sqlite3Prng;
+};
+
+extern struct sqlite3PrngType sqlite3Prng;
char *
decodeString(char *string, int inplace);
--- minidlna-1.2.1/tivo_utils.c 2020/06/08 08:47:38 1.1
+++ minidlna-1.2.1/tivo_utils.c 2020/06/08 08:47:50
@@ -27,6 +27,8 @@
#include
#include "tivo_utils.h"
+struct sqlite3PrngType sqlite3Prng;
+
/* This function based on byRequest */
char *
decodeString(char *string, int inplace)
