From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugk8-0000iG-NA for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eugk7-0005JJ-QQ for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugk7-0005J9-LY for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugk7-0004xK-Ew for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:07 -0500 Subject: [bug#30763] [PATCH core-updates 13/27] gnu: Switch from dri2proto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:47:53 +0100 Message-Id: <20180310154807.7225-13-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/gl.scm (mesa)[inputs]: Remove DRI2PROTO. * gnu/packages/video.scm (libvdpau)[inputs]: Replace DRI2PROTO with XORGPROTO. * gnu/packages/xorg.scm (dri2proto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[inputs]: Remove DRI2PROTO. --- gnu/packages/gl.scm | 1 - gnu/packages/video.scm | 6 +++--- gnu/packages/xorg.scm | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8bd74e0b3..5ac390e61 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -251,7 +251,6 @@ also known as DXTn or DXTC) for Mesa.") ("xorgproto" ,xorgproto))) (inputs `(("expat" ,expat) - ("dri2proto" ,dri2proto) ("dri3proto" ,dri3proto) ("libelf" ,libelf) ;required for r600 when using llvm ("libva" ,(force libva-without-mesa)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dfd94f9d3..e4d0748d4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1935,9 +1935,9 @@ and JACK.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("dri2proto" ,dri2proto) - ("libx11" ,libx11 "out") - ("libxext" ,libxext))) + `(("libx11" ,libx11 "out") + ("libxext" ,libxext) + ("xorgproto" ,xorgproto))) (home-page "https://wiki.freedesktop.org/www/Software/VDPAU/") (synopsis "Video Decode and Presentation API") (description "VDPAU is the Video Decode and Presentation API for UNIX. It diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 60d39cf2a..1a395c3f8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -346,7 +346,8 @@ servers making up a large display.") "Direct Rendering Infrastructure 2 Extension defines a protocol to securely 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 dri3proto (package @@ -5104,8 +5105,7 @@ over Xlib, including: (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs - `(("dri2proto" ,dri2proto) - ("dri3proto" ,dri3proto) + `(("dri3proto" ,dri3proto) ("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) -- 2.16.2