diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-12-28 15:15:44 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-12-28 15:15:44 +0100 |
| commit | 8c25bdd23f13c850c10330fc66c799a79c08f1e2 (patch) | |
| tree | 15950ef6c489078f4628959f5a2fb69253f1c2f2 /x11-drivers/xf86-video-openchrome | |
| parent | sci-electronics/geda: Port to EAPI 7 (diff) | |
| download | gentoo-8c25bdd23f13c850c10330fc66c799a79c08f1e2.tar.gz gentoo-8c25bdd23f13c850c10330fc66c799a79c08f1e2.tar.bz2 gentoo-8c25bdd23f13c850c10330fc66c799a79c08f1e2.zip | |
x11-drivers/xf86-video-openchrome: Fix build with gcc-10
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/707478
Closes: https://github.com/gentoo/gentoo/pull/18476
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-drivers/xf86-video-openchrome')
| -rw-r--r-- | x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch | 45 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild | 4 |
2 files changed, 48 insertions, 1 deletions
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 new file mode 100644 index 000000000000..78f3ca9a6cc9 --- /dev/null +++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch @@ -0,0 +1,45 @@ +--- a/src/via_driver.h ++++ b/src/via_driver.h +@@ -393,9 +393,6 @@ typedef struct + } VIAEntRec, *VIAEntPtr; + + +-/* In via_display.c. */ +-const xf86CrtcFuncsRec iga1_crtc_funcs; +-const xf86CrtcFuncsRec iga2_crtc_funcs; + + /* In via_exa.c. */ + Bool viaInitExa(ScreenPtr pScreen); +--- a/src/via_sii164.h ++++ b/src/via_sii164.h +@@ -47,7 +47,7 @@ typedef struct _viaSiI164 { + } viaSiI164Rec, *viaSiI164RecPtr; + + +-const xf86OutputFuncsRec via_sii164_funcs; ++extern const xf86OutputFuncsRec via_sii164_funcs; + + Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); + +--- a/src/via_ums.h ++++ b/src/via_ums.h +@@ -260,6 +260,8 @@ void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode); + void viaIGA2Save(ScrnInfoPtr pScrn); + void viaIGA2Restore(ScrnInfoPtr pScrn); + void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); ++extern const xf86CrtcFuncsRec iga1_crtc_funcs; ++extern const xf86CrtcFuncsRec iga2_crtc_funcs; + + /* via_analog.c */ + void via_analog_init(ScrnInfoPtr pScrn); +--- a/src/via_vt1632.h ++++ b/src/via_vt1632.h +@@ -44,7 +44,7 @@ typedef struct _viaVT1632Rec { + } viaVT1632Rec, *viaVT1632RecPtr; + + +-const xf86OutputFuncsRec via_vt1632_funcs; ++extern const xf86OutputFuncsRec via_vt1632_funcs; + + Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); + 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 index 0dce180b8afd..b2f2a36914b7 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,6 +24,8 @@ DEPEND=" DOCS=( ChangeLog NEWS README ) +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_configure() { XORG_CONFIGURE_OPTIONS=( $(use_enable debug) |