commit: 0a4647bca4fe8febfafb9286bd18d722ab31f230
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 5 15:29:37 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 15:39:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4647bc
x11-drivers/xf86-video-geode: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-drivers/xf86-video-geode/Manifest | 1 -
...0-fix-multiple-definition-of-linker-error.patch | 93 ----------------------
.../xf86-video-geode-2.11.20.ebuild | 28 -------
3 files changed, 122 deletions(-)
diff --git a/x11-drivers/xf86-video-geode/Manifest
b/x11-drivers/xf86-video-geode/Manifest
index a47e5f2f3669..d9dbb80abea0 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,2 +1 @@
-DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B
ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296
SHA512
a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
DIST xf86-video-geode-2.11.21.tar.xz 582492 BLAKE2B
a6a970284033497dbf359b1d9735d143476e96eca68560b68a49477af704ee9c9ef952b8ee144fc545cc88baf95cc4b34b8eb8a76efb3b9282bec1799d986f19
SHA512
e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61
diff --git
a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
deleted file mode 100644
index 5bacc0cfbc8d..000000000000
---
a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ba63bf6821c40707237ad2e7a13352a537e5b588 Mon Sep 17 00:00:00 2001
-From: Christian Gmeiner <christian.gmei...@gmail.com>
-Date: Thu, 3 Dec 2020 14:22:23 +0100
-Subject: [PATCH] fix 'multiple definition of' linker error
-
-Fix for FTBFS due to -fno-common on GCC 10.
-
-Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
----
- src/geode.h | 8 ++++----
- src/gx_driver.c | 2 +-
- src/gx_video.c | 2 +-
- src/lx_driver.c | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/geode.h b/src/geode.h
-index eb61c28..1b144ff 100644
---- a/src/geode.h
-+++ b/src/geode.h
-@@ -343,7 +343,7 @@ typedef struct _geodeRec {
-
- /* option flags are self-explanatory */
- #ifdef HAVE_LX
--enum {
-+enum LX_GeodeOpts {
- LX_OPTION_SW_CURSOR,
- LX_OPTION_HW_CURSOR,
- LX_OPTION_NOCOMPRESSION,
-@@ -357,11 +357,11 @@ enum {
- LX_OPTION_FBSIZE,
- LX_OPTION_PANEL_MODE,
- LX_OPTION_DONT_PROGRAM
--} LX_GeodeOpts;
-+};
- #endif
-
- #ifdef HAVE_GX
--enum {
-+enum GX_GeodeOpts {
- GX_OPTION_SW_CURSOR,
- GX_OPTION_HW_CURSOR,
- GX_OPTION_NOCOMPRESSION,
-@@ -378,7 +378,7 @@ enum {
- GX_OPTION_FBSIZE,
- GX_OPTION_PANEL_GEOMETRY,
- GX_OPTION_DONT_PROGRAM
--} GX_GeodeOpts;
-+};
- #endif
-
- /* geode_dcon.c */
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 4de336e..188828c 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -78,7 +78,7 @@
-
- extern OptionInfoRec GX_GeodeOptions[];
-
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
-
- static inline void
- gx_enable_dac_power(void)
-diff --git a/src/gx_video.c b/src/gx_video.c
-index 0d3e1c5..7964d17 100644
---- a/src/gx_video.c
-+++ b/src/gx_video.c
-@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int
height,
-
- extern void GXAccelSync(ScrnInfoPtr pScrni);
-
--int DeltaX, DeltaY;
-+extern int DeltaX, DeltaY;
-
- unsigned long graphics_lut[256];
- static int lutflag = 0;
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 47f6875..9cb8889 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -74,7 +74,7 @@
-
- extern OptionInfoRec LX_GeodeOptions[];
-
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
-
- static Bool
- LXSaveScreen(ScreenPtr pScrn, int mode)
---
-2.26.2
-
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
deleted file mode 100644
index be974bd039dd..000000000000
--- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="AMD Geode GX2 and LX video driver"
-
-KEYWORDS="x86"
-IUSE="ztv"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- ztv? (
- sys-kernel/linux-headers
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-multiple-definition-of-linker-error.patch
-)
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_enable ztv)
- )
- xorg-3_src_configure
-}
