(address . guix-patches@gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
20230131072738.11759-1-iyzsong@envs.net
From: ??? <iyzsong@member.fsf.org>
Those packages build failed with current xorg-server:
openchrome: multiple definition of some functions.
other: missing headers for xf86RamDac.h, IBM.h, etc.
* gnu/packages/xorg.scm (xf86-video-glint, xf86-video-openchrome
xf86-video-suncg6, xf86-video-sunffb, xf86-video-tga
xf86-video-trident): Remove packages.
* gnu/packages/patches/xf86-video-tga-remove-mibstore.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../xf86-video-tga-remove-mibstore.patch | 34 ----
gnu/packages/xorg.scm | 149 ------------------
3 files changed, 184 deletions(-)
delete mode 100644 gnu/packages/patches/xf86-video-tga-remove-mibstore.patch
Toggle diff (235 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 2d54c258ce..7d6cbf2a49 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2010,7 +2010,6 @@ dist_patch_DATA = \
%D%/packages/patches/xf86-video-qxl-fix-build.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
- %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
%D%/packages/patches/xf86-video-voodoo-pcitag.patch \
%D%/packages/patches/xfce4-panel-plugins.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \
diff --git a/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch b/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch
deleted file mode 100644
index b1a96c3f10..0000000000
--- a/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Removes references to mibstore.h and miInitializeBackingStore, which
-have been removed from xorg-server. Zack Rusin <zackr@vmware.com>
-wrote: "It was a noop for at least 5 years and it has been removed."
-See: http://patches.openembedded.org/patch/46133/
-
---- xf86-video-tga-1.2.2/src/tga_accel.c.~1~ 2012-07-15 23:54:04.000000000 -0400
-+++ xf86-video-tga-1.2.2/src/tga_accel.c 2014-12-19 01:40:27.535913013 -0500
-@@ -37,7 +37,6 @@
- #include "xf86cmap.h"
- #include "mipointer.h"
-
--#include "mibstore.h"
- #include "miline.h"
-
- #include "tga_regs.h"
---- xf86-video-tga-1.2.2/src/tga_driver.c.~1~ 2012-07-15 23:54:28.000000000 -0400
-+++ xf86-video-tga-1.2.2/src/tga_driver.c 2014-12-19 01:40:48.756018238 -0500
-@@ -46,8 +46,6 @@
-
- /* software cursor */
- #include "mipointer.h"
--/* backing store */
--#include "mibstore.h"
-
- /* #include "mibank.h" */
- /* colormap manipulation */
-@@ -1451,7 +1449,6 @@
-
- fbPictureInit (pScreen, 0, 0);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 64fca5800d..93c84f31ca 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2841,30 +2841,6 @@ (define-public xf86-video-geode
;; "xf86-video-glide is a Glide video driver for the Xorg X server.")
;; (license license:x11)))
-(define-public xf86-video-glint
- (package
- (name "xf86-video-glint")
- (version "1.2.9")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-glint-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"))))
- (build-system gnu-build-system)
- (inputs (list xorgproto xorg-server))
- (native-inputs (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "GLINT/Permedia video driver for X server")
- (description
- "xf86-video-glint is a GLINT/Permedia video driver for the Xorg
-X server.")
- (license license:x11)))
-
(define-public xf86-video-i128
(package
(name "xf86-video-i128")
@@ -3077,37 +3053,6 @@ (define-public xf86-video-nouveau
graphics cards.")
(license license:x11)))
-(define-public xf86-video-openchrome
- (package
- (name "xf86-video-openchrome")
- (version "0.6.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-openchrome-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"))))
- (build-system gnu-build-system)
- (inputs (list libx11
- libxext
- libxvmc
- mesa
- xorgproto
- xorg-server))
- (native-inputs
- (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "Openchrome video driver for X server")
- (description
- "xf86-video-openchrome is a video driver for the Xorg X server.
-This driver is intended for VIA chipsets featuring the VIA UniChrome,
-UniChrome Pro and Chrome9 integrated graphics processors.")
- (license license:x11)))
-
(define-public xf86-video-qxl
(package
(name "xf86-video-qxl")
@@ -3229,52 +3174,6 @@ (define-public xf86-video-sis
This driver supports SiS chipsets of 300/315/330/340 series.")
(license license:bsd-3)))
-(define-public xf86-video-suncg6
- (package
- (name "xf86-video-suncg6")
- (version "1.1.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-suncg6-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"))))
- (build-system gnu-build-system)
- (inputs (list xorg-server))
- (native-inputs (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "GX/TurboGX video driver for X server")
- (description
- "xf86-video-suncg6 is a GX/TurboGX video driver for the Xorg X server.")
- (license license:x11)))
-
-(define-public xf86-video-sunffb
- (package
- (name "xf86-video-sunffb")
- (version "1.2.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-sunffb-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"))))
- (build-system gnu-build-system)
- (inputs (list xorg-server))
- (native-inputs (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "SUNFFB video driver for X server")
- (description
- "xf86-video-sunffb is a SUNFFB video driver for the Xorg X server.")
- (license license:x11)))
-
(define-public xf86-video-tdfx
(package
(name "xf86-video-tdfx")
@@ -3298,54 +3197,6 @@ (define-public xf86-video-tdfx
"xf86-video-tdfx is a 3Dfx video driver for the Xorg X server.")
(license license:x11)))
-(define-public xf86-video-tga
- (package
- (name "xf86-video-tga")
- (version "1.2.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-tga-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"))
- (patches (search-patches "xf86-video-tga-remove-mibstore.patch"))))
- (build-system gnu-build-system)
- (inputs (list xorgproto xorg-server))
- (native-inputs (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "TGA video driver for X server")
- (description
- "xf86-video-tga is a TGA (DEC 21030) video driver for the Xorg
-X server.")
- (license license:x11)))
-
-(define-public xf86-video-trident
- (package
- (name "xf86-video-trident")
- (version "1.3.8")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/driver/xf86-video-trident-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"))))
- (build-system gnu-build-system)
- (inputs (list xorgproto xorg-server))
- (native-inputs (list pkg-config))
- (home-page "https://www.x.org/wiki/")
- (synopsis "Trident video driver for X server")
- (description
- "xf86-video-trident is a Trident video driver for the Xorg X server.")
- (license license:x11)))
-
;; no license
;; (define-public xf86-video-v4l
--
2.39.1