From b6b2a707fae4f2c75fbc00b63c6ed98fd69f1e10 Mon Sep 17 00:00:00 2001 From: liheavy <17865196565@163.com> Date: Wed, 4 Aug 2021 17:48:10 +0800 Subject: [PATCH] fix complication failed due to gcc upgrade --- 0001-fix-compilation-failed.patch | 46 +++++++++++++++++++++++++++++++ v4l-utils.spec | 7 ++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-fix-compilation-failed.patch diff --git a/0001-fix-compilation-failed.patch b/0001-fix-compilation-failed.patch new file mode 100644 index 0000000..0fd2370 --- /dev/null +++ b/0001-fix-compilation-failed.patch @@ -0,0 +1,46 @@ +diff -Nur a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h +--- a/lib/include/libdvbv5/desc_t2_delivery.h 2017-12-27 21:50:55.000000000 +0800 ++++ b/lib/include/libdvbv5/desc_t2_delivery.h 2021-08-04 17:30:33.868213100 +0800 +@@ -215,7 +215,7 @@ + * @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 -Nur a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h +--- a/lib/libdvbv5/dvb-v5.h 2017-12-27 21:50:55.000000000 +0800 ++++ b/lib/libdvbv5/dvb-v5.h 2021-08-04 17:30:26.627847000 +0800 +@@ -14,17 +14,17 @@ + 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[71]; +-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[71]; ++extern const char *delivery_system_name[20]; + #endif diff --git a/v4l-utils.spec b/v4l-utils.spec index a24ec23..920bcf8 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,11 +1,13 @@ Name: v4l-utils Version: 1.14.2 -Release: 5 +Release: 6 Summary: Linux utilities and libraries to handle media devices License: GPLv2+ and GPLv2 URL: http://www.linuxtv.org/downloads/v4l-utils/ Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2 Patch0000: v4l-utils-sysmacros.patch +Patch0001: 0001-fix-compilation-failed.patch + BuildRequires: alsa-lib-devel desktop-file-utils doxygen gettext BuildRequires: kernel-headers libjpeg-devel qt5-qtbase-devel systemd-devel Requires: udev @@ -155,6 +157,9 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5 %{_mandir}/man3/*.3* %changelog +* Mon Aug 2 2021 Haiwei Li - 1.14.2-6 +- Fix complication failed due to gcc upgrade + * Wed Nov 13 2019 caomeng - 1.14.2-5 - let libv4l1.so.0 in libv4l