From patchwork Tue Jan 31 07:27:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 46543 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C659127BBEB; Tue, 31 Jan 2023 07:28:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9BBE827BBE9 for ; Tue, 31 Jan 2023 07:28:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMl3o-0006k9-Ok; Tue, 31 Jan 2023 02:28:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMl3j-0006ja-Jf for guix-patches@gnu.org; Tue, 31 Jan 2023 02:28:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMl3j-0004U0-57 for guix-patches@gnu.org; Tue, 31 Jan 2023 02:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMl3i-0006rc-JU for guix-patches@gnu.org; Tue, 31 Jan 2023 02:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61194] [PATCH] gnu: Remove broken xf86 video drivers. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Jan 2023 07:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61194@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167515007126361 (code B ref -1); Tue, 31 Jan 2023 07:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jan 2023 07:27:51 +0000 Received: from localhost ([127.0.0.1]:51402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMl3X-0006r6-22 for submit@debbugs.gnu.org; Tue, 31 Jan 2023 02:27:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:45150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMl3U-0006qy-SA for submit@debbugs.gnu.org; Tue, 31 Jan 2023 02:27:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMl3U-0006iP-LV for guix-patches@gnu.org; Tue, 31 Jan 2023 02:27:48 -0500 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMl3S-0004RH-2X for guix-patches@gnu.org; Tue, 31 Jan 2023 02:27:48 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id DB72138A01B1; Tue, 31 Jan 2023 07:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1675150055; bh=FHmW1+ELOuBCV9pHD0XyviSev2oqbgCXLxKbWzgrags=; h=From:To:Cc:Subject:Date:From; b=pLkoaCXDdHwsQXI8zuZda/XiYagvXIGQAPEeGV1YQtmXbmptPQS3hN3S8g0Yo+U9Q i+UZw8931SfIFVn6X8StBwTRMO/BanWYBHz3h15Q61eYvojan+iS5ZLnVfaR5SGyrN 7lYzsWf1+NEfZgW/aXOiv/1Sl1vJJaqCznuvUhWf6XSX054H9hKmTvKFPOoViI58lr XaCZE6l8jvWKv2CHWmyiFQL0YNRsXh6+OjPZvuYCk+1ffIUZ2ynA6pd7RYqhFuR3VE 0OVxDBKmEIogqG0urZ2S7wAq213iKD35VyO9lF25KxC5GbM6WAcyCATYSrJN6F7KU9 FlnD4JXVP0xXpM7+dRI0oI9TTsK1VaBrcfKZWCm8EGOghgO6E3DENX5wsGV3ubIMTt f85NtR1pX18zSlktI3H7NYa56jOlpDr/PK2GE+a4OMD84rGOr2o4iYr6kzNV6dRxch LPeAxey3QFayHRiv5p6Nh7lm2LMG3sgElK3+4RssBKTThXvxhPcgw9so+4GaT39dma gh8NlI76aZL6e4+ZGdUsqrHFzliSMpHqmRHNZv0S1dQuQkCBuQ9wIcCTOxuWocvmRA TQ0qyPwyewK0he7/uv7NJhmFvLCPsNRG9MeL4Bmj9PZELbo3jwOUOh5F0gZxKYOtXt othwBz+BECm+ytM18Y8fX5tU= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id JCYAAgQ9MWs2; Tue, 31 Jan 2023 07:27:28 +0000 (UTC) Received: from localhost (unknown [182.150.116.135]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 31 Jan 2023 07:27:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ce8ee540; Tue, 31 Jan 2023 07:27:39 +0000 (UTC) Date: Tue, 31 Jan 2023 15:27:38 +0800 Message-Id: <20230131072738.11759-1-iyzsong@envs.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 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 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 -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