fix complication failed due to gcc upgrade
This commit is contained in:
parent
632eb38d54
commit
b6b2a707fa
46
0001-fix-compilation-failed.patch
Normal file
46
0001-fix-compilation-failed.patch
Normal file
@ -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
|
||||||
@ -1,11 +1,13 @@
|
|||||||
Name: v4l-utils
|
Name: v4l-utils
|
||||||
Version: 1.14.2
|
Version: 1.14.2
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Linux utilities and libraries to handle media devices
|
Summary: Linux utilities and libraries to handle media devices
|
||||||
License: GPLv2+ and GPLv2
|
License: GPLv2+ and GPLv2
|
||||||
URL: http://www.linuxtv.org/downloads/v4l-utils/
|
URL: http://www.linuxtv.org/downloads/v4l-utils/
|
||||||
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
|
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
|
||||||
Patch0000: v4l-utils-sysmacros.patch
|
Patch0000: v4l-utils-sysmacros.patch
|
||||||
|
Patch0001: 0001-fix-compilation-failed.patch
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel desktop-file-utils doxygen gettext
|
BuildRequires: alsa-lib-devel desktop-file-utils doxygen gettext
|
||||||
BuildRequires: kernel-headers libjpeg-devel qt5-qtbase-devel systemd-devel
|
BuildRequires: kernel-headers libjpeg-devel qt5-qtbase-devel systemd-devel
|
||||||
Requires: udev
|
Requires: udev
|
||||||
@ -155,6 +157,9 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5
|
|||||||
%{_mandir}/man3/*.3*
|
%{_mandir}/man3/*.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 1.14.2-6
|
||||||
|
- Fix complication failed due to gcc upgrade
|
||||||
|
|
||||||
* Wed Nov 13 2019 caomeng <caomeng5@huawei.com> - 1.14.2-5
|
* Wed Nov 13 2019 caomeng <caomeng5@huawei.com> - 1.14.2-5
|
||||||
- let libv4l1.so.0 in libv4l
|
- let libv4l1.so.0 in libv4l
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user