Commit 7a550f8b authored by Thiago Kenji Okada's avatar Thiago Kenji Okada
Browse files

xorg.xf86videotrident: 1.3.8 -> 1.4.0 

Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/4
parent be4adf56

pkgs/servers/x11/xorg/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2780,11 +2780,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {

    pname = "xf86-video-trident";

    version = "1.3.8";

    version = "1.4.0";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2";

      sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy";

      url = "mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz";

      sha256 = "16qqn1brz50mwcy42zi1wsw9af56qadsaaiwm9hn1p6plyf22xkz";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

+0 −36
Original line number Diff line number Diff line
@@ -500,42 +500,6 @@ self: super: 
    meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin

  });



  xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: {

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4

    postPatch = ''

      patch -p1 <<EOF

      diff --git a/src/trident.h b/src/trident.h

      index 5cadf52d3be13f03e94a8f443f1c8a04358296e8..c82de4c7debf3ee42e3b7965b738a6bd6ae9147d 100644

      --- a/src/trident.h

      +++ b/src/trident.h

      @@ -38,7 +38,6 @@

       #include "xaa.h"

       #endif

       #include "xf86fbman.h"

      -#include "xf86RamDac.h"

       #include "compiler.h"

       #include "vgaHW.h"

       #include "xf86i2c.h"

      @@ -103,7 +102,6 @@ typedef struct {

           int			useEXA;

           int			Chipset;

           int			DACtype;

      -    int			RamDac;

           int                 ChipRev;

           int			HwBpp;

           int			BppShift;

      @@ -169,7 +167,6 @@ typedef struct {

           CARD32		BltScanDirection;

           CARD32		DrawFlag;

           CARD16		LinePattern;

      -    RamDacRecPtr	RamDacRec;

           int			CursorOffset;

           xf86CursorInfoPtr	CursorInfoRec;

           xf86Int10InfoPtr	Int10;

       EOF

    '';

  });



  xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {

    buildInputs =  attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker

    env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12

pkgs/servers/x11/xorg/tarballs.list

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz 
mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz

mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2

mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2

mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz

mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2