Update to 1.24.1 for fix complication failed due to gcc update to 12.3.1

This commit is contained in:
starlet-dx 2023-07-13 19:46:02 +08:00
parent dc5a3850ce
commit eb01712617
5 changed files with 11 additions and 74 deletions

View File

@ -1,46 +0,0 @@
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

Binary file not shown.

BIN
v4l-utils-1.24.1.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,22 +0,0 @@
--- v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c.orig 2018-04-29 18:42:05.534170391 +0100
+++ v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c 2018-04-29 18:42:17.765044988 +0100
@@ -20,9 +20,7 @@
*/
#include <sys/types.h>
-#if defined(MAJOR_IN_SYSMACROS)
#include <sys/sysmacros.h>
-#endif
#include <sys/mman.h>
#include <fcntl.h>
#include <sys/stat.h>
--- v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp.orig 2018-04-29 18:49:34.091977421 +0100
+++ v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp 2018-04-29 18:50:11.588702105 +0100
@@ -27,6 +27,7 @@
#include <inttypes.h>
#include <getopt.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>

View File

@ -1,12 +1,10 @@
Name: v4l-utils
Version: 1.14.2
Release: 6
Version: 1.24.1
Release: 1
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
@ -108,7 +106,7 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5
%files -f %{name}.lang -f libdvbv5.lang
%doc README lib/libdvbv5/README.libdvbv5
%doc README.md lib/libdvbv5/README.libdvbv5
%dir %{_sysconfdir}/rc_keymaps
%config(noreplace) %{_sysconfdir}/rc_maps.cfg
%{_udevrulesdir}/70-infrared.rules
@ -124,8 +122,11 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5
%{_bindir}/v4l2-ctl
%{_bindir}/v4l2-sysfs-path
%{_bindir}/qv4l2
%{_bindir}/qvidcap
%{_datadir}/applications/qv4l2.desktop
%{_datadir}/applications/qvidcap.desktop
%{_datadir}/icons/hicolor/*/apps/qv4l2.*
%{_datadir}/icons/hicolor/*/apps/qvidcap.*
%{_libdir}/libdvbv5*.so.*
%files -n libv4l
@ -137,7 +138,7 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5
%files devel-tools
%doc README
%doc README.md
%{_bindir}/decode_tm6000
%{_bindir}/v4l2-compliance
%{_sbindir}/v4l2-dbg
@ -155,8 +156,12 @@ mv lib/libdvbv5/README lib/libdvbv5/README.libdvbv5
%files help
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*
%{_mandir}/man5/*.5*
%changelog
* Thu Jul 13 2023 yaoxin <yao_xin001@hoperun.com> - 1.24.1-1
- Update to 1.24.1 for fix complication failed due to gcc update to 12.3.1
* Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 1.14.2-6
- Fix complication failed due to gcc upgrade