svn commit: r545554 - branches/2020Q3/multimedia/libv4l/files

[Niclas Zeising]

Author: zeising
Date: Thu Aug 20 19:26:59 2020
New Revision: 545554
URL: https://svnweb.freebsd.org/changeset/ports/545554

Log:
  MFH: r545453
  
  multimeida/libv4l: Fix build with -fno-common
  
  Add a patch from upstream to fix the build of multimedia/libv4l with
  -fno-common, which is the default with llvm 11.
  
  PR:		248738
  Reported by:	dim
  
  Approved by:	ports-secteam (joenum)

Added:
  branches/2020Q3/multimedia/libv4l/files/patch-afb12361.c
     - copied unchanged from r545453, head/multimedia/libv4l/files/patch-afb12361.c
Modified:
Directory Properties:
  branches/2020Q3/   (props changed)

Copied: branches/2020Q3/multimedia/libv4l/files/patch-afb12361.c (from r545453, head/multimedia/libv4l/files/patch-afb12361.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/multimedia/libv4l/files/patch-afb12361.c	Thu Aug 20 19:26:59 2020	(r545554, copy of r545453, head/multimedia/libv4l/files/patch-afb12361.c)
@@ -0,0 +1,68 @@
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap at gentoo.org>
+Date: Wed, 26 Feb 2020 11:07:29 +0100
+Subject: Fix GCC 10 / -fno-common
+
+* GCC 10 switches its default symbol emission mode
+  to cause linker errors when an object is defined
+  more than once.
+
+Bug: https://bugs.gentoo.org/706756
+Signed-off-by: David Seifert <soap at gentoo.org>
+Signed-off-by: Hans Verkuil <hverkuil-cisco at xs4all.nl>
+---
+ lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
+ lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
+index 93594b76..8c11fa9a 100644
+--- lib/include/libdvbv5/desc_t2_delivery.h
++++ lib/include/libdvbv5/desc_t2_delivery.h
+@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
+  * @brief converts from internal representation to string the SISO_MISO
+  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
+  */
+-const char *siso_miso[4];
++extern const char *siso_miso[4];
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
+index 45aaddda..3540bac1 100644
+--- lib/libdvbv5/dvb-v5.h
++++ lib/libdvbv5/dvb-v5.h
+@@ -14,17 +14,17 @@ struct fe_status_name {
+ 	char *name;
+ };
+ extern struct fe_status_name fe_status_name[8];
+-const char *fe_code_rate_name[14];
+-const char *fe_modulation_name[15];
+-const char *fe_transmission_mode_name[10];
+-const unsigned fe_bandwidth_name[8];
+-const char *fe_guard_interval_name[12];
+-const char *fe_hierarchy_name[6];
+-const char *fe_voltage_name[4];
+-const char *fe_tone_name[3];
+-const char *fe_inversion_name[4];
+-const char *fe_pilot_name[4];
+-const char *fe_rolloff_name[5];
+-const char *dvb_v5_name[72];
+-const char *delivery_system_name[20];
++extern const char *fe_code_rate_name[14];
++extern const char *fe_modulation_name[15];
++extern const char *fe_transmission_mode_name[10];
++extern const unsigned fe_bandwidth_name[8];
++extern const char *fe_guard_interval_name[12];
++extern const char *fe_hierarchy_name[6];
++extern const char *fe_voltage_name[4];
++extern const char *fe_tone_name[3];
++extern const char *fe_inversion_name[4];
++extern const char *fe_pilot_name[4];
++extern const char *fe_rolloff_name[5];
++extern const char *dvb_v5_name[72];
++extern const char *delivery_system_name[20];
+ #endif
+-- 
+cgit v1.2.1
+