diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a958847f35..7de177f9c0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1506,7 +1506,7 @@ treat it as part of their software base when porting.") "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f")))) (build-system gnu-build-system) (propagated-inputs - `(("xf86dgaproto" ,xf86dgaproto))) + `(("xorgproto" ,xorgproto))) (inputs `(("libx11" ,libx11) ("libxext" ,libxext))) @@ -2870,7 +2870,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") (base32 "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45")))) (build-system gnu-build-system) - (inputs `(("xf86dgaproto" ,xf86dgaproto) + (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3023,7 +3023,7 @@ the same level of support for generic VGA or 8514/A adapters.") (base32 "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j")))) (build-system gnu-build-system) - (inputs `(("xf86dgaproto" ,xf86dgaproto) + (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3159,7 +3159,6 @@ UniChrome Pro and Chrome9 integrated graphics processors.") (inputs `(("libxfont" ,libxfont2) ("spice-protocol" ,spice-protocol) - ("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server) ("xorgproto" ,xorgproto))) (native-inputs @@ -3266,7 +3265,6 @@ Xorg X server.") "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("xf86dgaproto" ,xf86dgaproto) ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs @@ -3369,7 +3367,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0")) (patches (search-patches "xf86-video-tga-remove-mibstore.patch")))) (build-system gnu-build-system) - (inputs `(("xf86dgaproto" ,xf86dgaproto) + (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3395,7 +3393,7 @@ X server.") (base32 "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy")))) (build-system gnu-build-system) - (inputs `(("xf86dgaproto" ,xf86dgaproto) + (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3489,7 +3487,7 @@ xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593") "0rndmxf5b8j3hjnhrwrnzsq5024fli134fj1mprhkcrvax2zq8db")) (file-name "xf86-video-voodoo-pcitag.patch")))))) (build-system gnu-build-system) - (inputs `(("xf86dgaproto" ,xf86dgaproto) + (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3546,8 +3544,8 @@ for the XF86BigFontProto protocol.") (description "XFree86 Direct Graphic Access Extension defines a protocol for direct linear framebuffer access.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public xf86driproto (package @@ -5115,7 +5113,6 @@ over Xlib, including: ("libxt" ,libxt) ("libxv" ,libxv) ("xf86bigfontproto" ,xf86bigfontproto) - ("xf86dgaproto" ,xf86dgaproto) ("xf86vidmodeproto" ,xf86vidmodeproto) ("xkbcomp" ,xkbcomp) ("xkeyboard-config" ,xkeyboard-config)