summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-02-26 00:37:50 +0100
committerDavid Seifert <soap@gentoo.org>2020-02-26 00:37:50 +0100
commit3eb69318e07bd2df74d4ee009e8eb3d8dc6563f6 (patch)
tree6714499670dbb182f84db1b344e8c920e4be9afa /media-libs/libv4l
parentmedia-libs/freeglut: Fix GCC 10 / -fno-common (diff)
downloadgentoo-3eb69318e07bd2df74d4ee009e8eb3d8dc6563f6.tar.gz
gentoo-3eb69318e07bd2df74d4ee009e8eb3d8dc6563f6.tar.bz2
gentoo-3eb69318e07bd2df74d4ee009e8eb3d8dc6563f6.zip
media-libs/libv4l: Fix GCC 10 / -fno-common
Closes: https://bugs.gentoo.org/706756 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-libs/libv4l')
-rw-r--r--media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch44
-rw-r--r--media-libs/libv4l/libv4l-1.16.6.ebuild4
2 files changed, 47 insertions, 1 deletions
diff --git a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000000000000..ea43fb82e3fd
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/lib/include/libdvbv5/desc_t2_delivery.h
++++ b/lib/include/libdvbv5/desc_t2_delivery.h
+@@ -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
+ }
+--- a/lib/libdvbv5/dvb-v5.h
++++ b/lib/libdvbv5/dvb-v5.h
+@@ -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[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
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 3fafe417aecc..b518b7a92192 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
pkg_setup() {
CONFIG_CHECK="~SHMEM"
linux-info_pkg_setup