From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugkF-0000rs-A6 for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eugkC-0005Np-A4 for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:15 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugkC-0005NR-4f for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugkB-0004yX-UW for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:11 -0500 Subject: [bug#30763] [PATCH core-updates 23/27] gnu: Switch from xf86driproto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:48:03 +0100 Message-Id: <20180310154807.7225-23-mbakke@fastmail.com> In-Reply-To: <20180310154807.7225-1-mbakke@fastmail.com> References: <20180310154807.7225-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30763@debbugs.gnu.org * gnu/packages/xorg.scm (xf86-video-mach64, xf86-video-mga, xf86-video-ati, xf86-video-openchrome, xf86-video-r128, xf86-video-savage, xf86-video-sis, xf86-video-tdfx)[inputs]: Replace XF86DRIPROTO with XORGPROTO. (xf86driproto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[inputs]: Remove XF86DRIPROTO. --- gnu/packages/xorg.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index eac098d9b..92d4b46a8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2686,7 +2686,7 @@ as USB mice.") "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xxf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor @@ -2976,7 +2976,7 @@ It supports a variety of Intel graphics chipsets.") (patches (search-patches "xf86-video-mach64-glibc-2.20.patch")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3007,7 +3007,7 @@ the same level of support for generic VGA or 8514/A adapters.") "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3138,7 +3138,7 @@ graphics cards.") ("libxext" ,libxext) ("libxvmc" ,libxvmc) ("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3195,7 +3195,7 @@ This driver is intended for the spice qxl virtio device.") "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3222,7 +3222,7 @@ This driver is intended for ATI Rage 128 based cards.") "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3275,7 +3275,7 @@ Xorg X server.") (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86dgaproto" ,xf86dgaproto) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3351,7 +3351,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86driproto" ,xf86driproto) + ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3578,8 +3578,8 @@ direct linear framebuffer access.") "XFree86 Direct Rendering Infrastructure Extension defines a protocol to allow user applications to access the video hardware without requiring data to be passed through the X server.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public xf86vidmodeproto (package @@ -5106,7 +5106,6 @@ over Xlib, including: ("mesa" ,mesa) ("pixman" ,pixman) ("xineramaproto" ,xineramaproto) - ("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto))) (inputs `(("udev" ,eudev) -- 2.16.2