1 |
commit: 7d29f89250c815ce65f73d6fa2e14662f621a221 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 26 12:12:17 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 26 12:12:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d29f892 |
7 |
|
8 |
media-libs/libv4l: Use merged patch from upstream |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706756 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../files/libv4l-1.16.6-gcc10-fno-common.patch | 28 ++++++++++++++++++++-- |
15 |
1 file changed, 26 insertions(+), 2 deletions(-) |
16 |
|
17 |
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 |
18 |
index ea43fb82e3f..33855c682b6 100644 |
19 |
--- a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch |
20 |
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch |
21 |
@@ -1,6 +1,25 @@ |
22 |
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001 |
23 |
+From: David Seifert <soap@g.o> |
24 |
+Date: Wed, 26 Feb 2020 11:07:29 +0100 |
25 |
+Subject: Fix GCC 10 / -fno-common |
26 |
+ |
27 |
+* GCC 10 switches its default symbol emission mode |
28 |
+ to cause linker errors when an object is defined |
29 |
+ more than once. |
30 |
+ |
31 |
+Bug: https://bugs.gentoo.org/706756 |
32 |
+Signed-off-by: David Seifert <soap@g.o> |
33 |
+Signed-off-by: Hans Verkuil <hverkuil-cisco@××××××.nl> |
34 |
+--- |
35 |
+ lib/include/libdvbv5/desc_t2_delivery.h | 2 +- |
36 |
+ lib/libdvbv5/dvb-v5.h | 26 +++++++++++++------------- |
37 |
+ 2 files changed, 14 insertions(+), 14 deletions(-) |
38 |
+ |
39 |
+diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h |
40 |
+index 93594b76..8c11fa9a 100644 |
41 |
--- a/lib/include/libdvbv5/desc_t2_delivery.h |
42 |
+++ b/lib/include/libdvbv5/desc_t2_delivery.h |
43 |
-@@ -215,7 +215,7 @@ |
44 |
+@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[]; |
45 |
* @brief converts from internal representation to string the SISO_MISO |
46 |
* field of dvb_desc_t2_delivery:SISO_MISO field. |
47 |
*/ |
48 |
@@ -9,9 +28,11 @@ |
49 |
|
50 |
#ifdef __cplusplus |
51 |
} |
52 |
+diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h |
53 |
+index 45aaddda..3540bac1 100644 |
54 |
--- a/lib/libdvbv5/dvb-v5.h |
55 |
+++ b/lib/libdvbv5/dvb-v5.h |
56 |
-@@ -14,17 +14,17 @@ |
57 |
+@@ -14,17 +14,17 @@ struct fe_status_name { |
58 |
char *name; |
59 |
}; |
60 |
extern struct fe_status_name fe_status_name[8]; |
61 |
@@ -42,3 +63,6 @@ |
62 |
+extern const char *dvb_v5_name[72]; |
63 |
+extern const char *delivery_system_name[20]; |
64 |
#endif |
65 |
+-- |
66 |
+cgit v1.2.1 |
67 |
+ |