[Buildroot] [PATCH 1/1] package/minidlna: Fix FTBFS with gcc10

[Buildroot] [PATCH 1/1] package/minidlna: Fix FTBFS with gcc10

[Bernd Kuhls]

Bug was reported upstream:
https://sourceforge.net/p/minidlna/patches/182/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/minidlna/0001-fix-gcc10-ftbfs.patch | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/minidlna/0001-fix-gcc10-ftbfs.patch

diff --git a/package/minidlna/0001-fix-gcc10-ftbfs.patch b/package/minidlna/0001-fix-gcc10-ftbfs.patch
new file mode 100644
index 0000000000..02397890c9
--- /dev/null
+++ b/package/minidlna/0001-fix-gcc10-ftbfs.patch
@@ -0,0 +1,35 @@
+Fix FTBFS with gcc10
+
+Downloaded from
+https://sources.debian.org/src/minidlna/1.2.1+dfsg-2/debian/patches/14-fix-gcc10-ftbfs.patch/
+
+Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957541
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/metadata.c
++++ b/metadata.c
+@@ -484,12 +484,12 @@
+ }
+ 
+ /* For libjpeg error handling */
+-jmp_buf setjmp_buffer;
++jmp_buf metadata_setjmp_buffer;
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+ {
+ 	cinfo->err->output_message (cinfo);
+-	longjmp(setjmp_buffer, 1);
++	longjmp(metadata_setjmp_buffer, 1);
+ 	return;
+ }
+ 
+@@ -613,7 +613,7 @@
+ 			cinfo.err = jpeg_std_error(&jerr);
+ 			jerr.error_exit = libjpeg_error_handler;
+ 			jpeg_create_decompress(&cinfo);
+-			if( setjmp(setjmp_buffer) )
++			if( setjmp(metadata_setjmp_buffer) )
+ 				goto error;
+ 			jpeg_stdio_src(&cinfo, infile);
+ 			jpeg_read_header(&cinfo, TRUE);
-- 
2.26.2

[Buildroot] [PATCH 1/1] package/minidlna: Fix FTBFS with gcc10

[Thomas Petazzoni]

On Sat, 27 Jun 2020 13:43:14 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Bug was reported upstream:
> https://sourceforge.net/p/minidlna/patches/182/

This bug doesn't seem at all to match this gcc10 build issue. Am I
missing something?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/minidlna: Fix FTBFS with gcc10

[Bernd Kuhls]

Am Sat, 27 Jun 2020 17:12:27 +0200 schrieb Thomas Petazzoni:

> On Sat, 27 Jun 2020 13:43:14 +0200 Bernd Kuhls
> <bernd.kuhls@t-online.de> wrote:
> 
>> Bug was reported upstream:
>> https://sourceforge.net/p/minidlna/patches/182/
> 
> This bug doesn't seem at all to match this gcc10 build issue. Am I
> missing something?
> 
> Thomas

Hi Thomas,

oops, added the wrong link, this is the right one:
https://sourceforge.net/p/minidlna/support-requests/70/

Regards, Bernd

[Buildroot] [PATCH 1/1] package/minidlna: Fix FTBFS with gcc10

[Yann E. MORIN]

On 2020-06-27 17:15 +0200, Bernd Kuhls spake thusly:
> Am Sat, 27 Jun 2020 17:12:27 +0200 schrieb Thomas Petazzoni:
> > On Sat, 27 Jun 2020 13:43:14 +0200 Bernd Kuhls
> > <bernd.kuhls@t-online.de> wrote:
> >> Bug was reported upstream:
> >> https://sourceforge.net/p/minidlna/patches/182/
> > This bug doesn't seem at all to match this gcc10 build issue. Am I
> > missing something?

That's because setjmp_buffer is also declared in image_utils.c, and this
triggers the infamous gcc-10 -fno-common error.

> oops, added the wrong link, this is the right one:
> https://sourceforge.net/p/minidlna/support-requests/70/

Ah, but as I see it, both the proposal in that bug repot (addign extern
in front of one of them), or renaming the variable in metadata.c or in 
mage_utils.c, are wrong.

The real fix is to turn both variables as static, so their scope is
limited to the file they are defined and use in.

Care to take that with upstream (and debian), please?

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'