diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..708ffb9 --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,68 @@ +From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001 +From: David Seifert +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 +Signed-off-by: Hans Verkuil +--- + 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 +--- a/lib/include/libdvbv5/desc_t2_delivery.h ++++ b/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 +--- a/lib/libdvbv5/dvb-v5.h ++++ b/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 + diff --git a/v4l-utils.changes b/v4l-utils.changes index de27a5b..7d43e6e 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 12:14:12 UTC 2020 - Tomáš Chvátal + +- Add patch for gcc 10 bsc#1160298: + * gcc10.patch + ------------------------------------------------------------------- Wed Jan 8 09:02:26 UTC 2020 - Tomáš Chvátal diff --git a/v4l-utils.spec b/v4l-utils.spec index dab891d..d299e73 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -28,7 +28,6 @@ Version: 1.18.0 Release: 0 Summary: Utilities for video4linux License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-2.0-only -Group: Hardware/TV URL: https://linuxtv.org/downloads/v4l-utils/ Source0: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.bz2 Source1: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.bz2.asc @@ -37,6 +36,7 @@ Source100: baselibs.conf Patch0: sysmacros.patch Patch1: use_system_v4l_for_qv4l.patch Patch2: v4l-utils-32bitfix.patch +Patch3: gcc10.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake @@ -70,7 +70,6 @@ v4l-utils is a collection of various video4linux (V4L) utilities. %package devel-tools Summary: Utilities for v4l2 / DVB driver development and debugging License: GPL-2.0-or-later AND GPL-2.0-only -Group: Hardware/TV Requires: libv4l = %{version} %description devel-tools @@ -79,7 +78,6 @@ Utilities for v4l2 / DVB driver authors for development and debugging. %package -n dvb-utils Summary: Utilities for DVB devices License: GPL-2.0-only -Group: Hardware/TV Recommends: dtv-scan-tables-v5 %description -n dvb-utils @@ -88,7 +86,6 @@ dvb-utils is a collection of various DVB utilities. %package -n libdvbv5-%{so_ver} Summary: Library that provides access to DVB adapter cards License: GPL-2.0-only -Group: System/Libraries %description -n libdvbv5-%{so_ver} libdvbv5 is a library meant to be used by digital TV applications that need to @@ -99,7 +96,6 @@ This package contains shared lib for packages that use libdvbv5. %package -n libdvbv5-devel Summary: Development files for libdvbv5 License: GPL-2.0-only -Group: Development/Libraries/C and C++ Requires: libdvbv5-%{so_ver} = %{version} %description -n libdvbv5-devel @@ -109,7 +105,6 @@ developing applications that use libdvbv5. %package -n libv4l Summary: Collection of video4linux support libraries License: LGPL-2.1-or-later AND GPL-2.0-only -Group: System/Libraries %description -n libv4l libv4l is a collection of libraries which adds a thin abstraction layer on @@ -120,7 +115,6 @@ having to write separate code for different devices in the same class. %package -n libv4l1-%{so_ver} Summary: Video4linux support library License: LGPL-2.1-or-later -Group: System/Libraries Requires: libv4l %description -n libv4l1-%{so_ver} @@ -133,7 +127,6 @@ This package contains shared lib for packages that use libv4l1. %package -n libv4l2-%{so_ver} Summary: Video4linux support library License: LGPL-2.1-or-later -Group: System/Libraries Requires: libv4l %description -n libv4l2-%{so_ver} @@ -145,7 +138,6 @@ This package contains shared lib for packages that use libv4l2. %package -n libv4l2rds%{so_ver} Summary: Video4linux support library License: LGPL-2.1-or-later -Group: System/Libraries Requires: libv4l %description -n libv4l2rds%{so_ver} @@ -157,7 +149,6 @@ This package contains shared lib for packages that use libv4l2rds. %package -n libv4lconvert%{so_ver} Summary: Video4linux support library License: LGPL-2.1-or-later -Group: System/Libraries Requires: libv4l %description -n libv4lconvert%{so_ver} @@ -169,7 +160,6 @@ This package contains shared lib for packages that use libv4lconvert. %package -n libv4l-devel Summary: Development files for libv4l License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libv4l1-%{so_ver} = %{version} Requires: libv4l2-%{so_ver} = %{version} Requires: libv4l2rds%{so_ver} = %{version} @@ -182,7 +172,6 @@ developing applications that use libv4l. %package -n qv4l2 Summary: Video4linux test control and streaming test application License: GPL-2.0-or-later -Group: Hardware/TV Requires: libv4l = %{version} Requires(post): hicolor-icon-theme Requires(post): update-desktop-files @@ -197,6 +186,7 @@ qv4l2 is a test control and streaming test application for video4linux. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -vfi