| 1 |
commit: 8c25bdd23f13c850c10330fc66c799a79c08f1e2 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 14:15:44 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 14:15:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c25bdd2 |
| 7 |
|
| 8 |
x11-drivers/xf86-video-openchrome: Fix build with gcc-10 |
| 9 |
|
| 10 |
* Thanks to Sam James for providing the patch link |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/707478 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/18476 |
| 14 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 15 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 17 |
|
| 18 |
.../xf86-video-openchrome-0.6.0-fno-common.patch | 45 ++++++++++++++++++++++ |
| 19 |
.../xf86-video-openchrome-0.6.0.ebuild | 4 +- |
| 20 |
2 files changed, 48 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..78f3ca9a6cc |
| 25 |
--- /dev/null |
| 26 |
+++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch |
| 27 |
@@ -0,0 +1,45 @@ |
| 28 |
+--- a/src/via_driver.h |
| 29 |
++++ b/src/via_driver.h |
| 30 |
+@@ -393,9 +393,6 @@ typedef struct |
| 31 |
+ } VIAEntRec, *VIAEntPtr; |
| 32 |
+ |
| 33 |
+ |
| 34 |
+-/* In via_display.c. */ |
| 35 |
+-const xf86CrtcFuncsRec iga1_crtc_funcs; |
| 36 |
+-const xf86CrtcFuncsRec iga2_crtc_funcs; |
| 37 |
+ |
| 38 |
+ /* In via_exa.c. */ |
| 39 |
+ Bool viaInitExa(ScreenPtr pScreen); |
| 40 |
+--- a/src/via_sii164.h |
| 41 |
++++ b/src/via_sii164.h |
| 42 |
+@@ -47,7 +47,7 @@ typedef struct _viaSiI164 { |
| 43 |
+ } viaSiI164Rec, *viaSiI164RecPtr; |
| 44 |
+ |
| 45 |
+ |
| 46 |
+-const xf86OutputFuncsRec via_sii164_funcs; |
| 47 |
++extern const xf86OutputFuncsRec via_sii164_funcs; |
| 48 |
+ |
| 49 |
+ Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); |
| 50 |
+ |
| 51 |
+--- a/src/via_ums.h |
| 52 |
++++ b/src/via_ums.h |
| 53 |
+@@ -260,6 +260,8 @@ void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode); |
| 54 |
+ void viaIGA2Save(ScrnInfoPtr pScrn); |
| 55 |
+ void viaIGA2Restore(ScrnInfoPtr pScrn); |
| 56 |
+ void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); |
| 57 |
++extern const xf86CrtcFuncsRec iga1_crtc_funcs; |
| 58 |
++extern const xf86CrtcFuncsRec iga2_crtc_funcs; |
| 59 |
+ |
| 60 |
+ /* via_analog.c */ |
| 61 |
+ void via_analog_init(ScrnInfoPtr pScrn); |
| 62 |
+--- a/src/via_vt1632.h |
| 63 |
++++ b/src/via_vt1632.h |
| 64 |
+@@ -44,7 +44,7 @@ typedef struct _viaVT1632Rec { |
| 65 |
+ } viaVT1632Rec, *viaVT1632RecPtr; |
| 66 |
+ |
| 67 |
+ |
| 68 |
+-const xf86OutputFuncsRec via_vt1632_funcs; |
| 69 |
++extern const xf86OutputFuncsRec via_vt1632_funcs; |
| 70 |
+ |
| 71 |
+ Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild |
| 75 |
index 0dce180b8af..b2f2a36914b 100644 |
| 76 |
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild |
| 77 |
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2017 Gentoo Foundation |
| 80 |
+# Copyright 1999-2020 Gentoo Authors |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI=5 |
| 84 |
@@ -24,6 +24,8 @@ DEPEND=" |
| 85 |
|
| 86 |
DOCS=( ChangeLog NEWS README ) |
| 87 |
|
| 88 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 89 |
+ |
| 90 |
src_configure() { |
| 91 |
XORG_CONFIGURE_OPTIONS=( |
| 92 |
$(use_enable debug) |
Archives