Unverified Commit 0268565f authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #219864 from thiagokokada/xorg-pkgs-bump 

xorg.xf86video{suncg6,sunffb,sunleo,trident,qxl}: bumps
parents 0ad2fc0c cfc997d8

pkgs/servers/x11/xorg/default.nix

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

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

    pname = "xf86-video-qxl";

    version = "0.1.5";

    version = "0.1.6";

    builder = ./builder.sh;

    src = fetchurl {

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

      sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi";

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

      sha256 = "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;
@@ -2700,11 +2700,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

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

    pname = "xf86-video-suncg6";

    version = "1.1.2";

    version = "1.1.3";

    builder = ./builder.sh;

    src = fetchurl {

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

      sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";

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

      sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;
@@ -2716,11 +2716,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

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

    pname = "xf86-video-sunffb";

    version = "1.2.2";

    version = "1.2.3";

    builder = ./builder.sh;

    src = fetchurl {

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

      sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";

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

      sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;
@@ -2732,11 +2732,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

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

    pname = "xf86-video-sunleo";

    version = "1.2.2";

    version = "1.2.3";

    builder = ./builder.sh;

    src = fetchurl {

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

      sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3";

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

      sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;
@@ -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 −100
Original line number Diff line number Diff line
@@ -490,104 +490,14 @@ self: super: 


  xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {

    meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8

    postPatch = ''

      patch -p1 <<EOF

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

      index 9f176e69dc1f6fc5e35ca20c30a4d3b4faf52623..d6bc19e8767c6aee9e7174a43cf1d71a9f35af32 100644

      --- a/src/cg6.h

      +++ b/src/cg6.h

      @@ -26,7 +26,7 @@



       #include "xf86.h"

       #include "xf86_OSproc.h"

      -#include "xf86RamDac.h"

      +#include "xf86Cursor.h"

       #include <X11/Xmd.h>

       #include "gcstruct.h"

       #include "cg6_regs.h"

       EOF

    '';

  });



  xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {

    meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22

    postPatch = ''

      patch -p1 <<EOF

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

      index 67a2d87afa607b6bea07e53f4be738c1ebb757ab..d87024033fb48a83c50c588866c90cd6eac0975c 100644

      --- a/src/ffb.h

      +++ b/src/ffb.h

      @@ -30,7 +30,7 @@



       #include "xf86.h"

       #include "xf86_OSproc.h"

      -#include "xf86RamDac.h"

      +#include "xf86Cursor.h"

       #ifdef HAVE_XAA_H

       #include "xaa.h"

       #endif

       EOF

    '';

  });



  xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: {

    meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/commit/f58ba53e6b6fe1b6e21d6aa3901a11e6130b95b0

    postPatch = ''

      patch -p1 <<EOF

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

      index a5bf41d34955d81b7ea14d4da6bc7f65191a3f98..c45c59b71be679333216d289d689a3c06c8dcbf7 100644

      --- a/src/leo.h

      +++ b/src/leo.h

      @@ -26,7 +26,7 @@



       #include "xf86.h"

       #include "xf86_OSproc.h"

      -#include "xf86RamDac.h"

      +#include "xf86Cursor.h"

       #include <X11/Xmd.h>

       #include "gcstruct.h"

       #include "leo_regs.h"

       EOF

    '';

  });



  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: {
@@ -599,16 +509,6 @@ self: super: 
  });



  xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/issues/12

    postPatch = ''

      patch -p1 <<EOF

      --- a/src/qxl_option_helpers.c

      +++ b/src/qxl_option_helpers.c

      @@ -37 +37 @@

      -        return options[option_index].value.bool;

      +        return options[option_index].value.boolean;

      EOF

    '';

    buildInputs =  attrs.buildInputs ++ [ spice-protocol ];

  });

pkgs/servers/x11/xorg/tarballs.list

+5 −5
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca 
mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2

mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2

mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2

mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz

mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz

mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2

mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
@@ -116,12 +116,12 @@ mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2

mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2

mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2

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

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

mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz

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