mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-12 08:01:50 +00:00
mesa: feature update 17.0.6 -> 17.1.1
Main changes: https://www.mesa3d.org/relnotes/17.1.0.html - two options got renamed - "ilo" driver was removed upstream - python is no longer needed for build I tested nouveau for a bit.
This commit is contained in:
parent
77b7fca588
commit
1f407a46d6
pkgs/development/libraries/mesa
|
@ -2,7 +2,7 @@
|
||||||
, pkgconfig, intltool, autoreconfHook, substituteAll
|
, pkgconfig, intltool, autoreconfHook, substituteAll
|
||||||
, file, expat, libdrm, xorg, wayland, openssl
|
, file, expat, libdrm, xorg, wayland, openssl
|
||||||
, llvmPackages, libffi, libomxil-bellagio, libva
|
, llvmPackages, libffi, libomxil-bellagio, libva
|
||||||
, libelf, libvdpau, python2
|
, libelf, libvdpau
|
||||||
, grsecEnabled ? false
|
, grsecEnabled ? false
|
||||||
, enableRadv ? false
|
, enableRadv ? false
|
||||||
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
|
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
|
||||||
|
@ -36,7 +36,7 @@ let
|
||||||
then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
|
then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
|
||||||
else if stdenv.isAarch64
|
else if stdenv.isAarch64
|
||||||
then ["nouveau" "vc4" ]
|
then ["nouveau" "vc4" ]
|
||||||
else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
|
else ["i915" "r300" "r600" "radeonsi" "nouveau"];
|
||||||
defaultDriDrivers =
|
defaultDriDrivers =
|
||||||
if (stdenv.isArm || stdenv.isAarch64)
|
if (stdenv.isArm || stdenv.isAarch64)
|
||||||
then ["nouveau"]
|
then ["nouveau"]
|
||||||
|
@ -67,7 +67,7 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "17.0.6";
|
version = "17.1.1";
|
||||||
branch = head (splitString "." version);
|
branch = head (splitString "." version);
|
||||||
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
||||||
in
|
in
|
||||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
||||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||||
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
|
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49";
|
sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = "patchShebangs .";
|
prePatch = "patchShebangs .";
|
||||||
|
@ -103,7 +103,7 @@ stdenv.mkDerivation {
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
"--with-dri-driverdir=$(drivers)/lib/dri"
|
"--with-dri-driverdir=$(drivers)/lib/dri"
|
||||||
"--with-dri-searchpath=${driverLink}/lib/dri"
|
"--with-dri-searchpath=${driverLink}/lib/dri"
|
||||||
"--with-egl-platforms=x11,wayland,drm"
|
"--with-platforms=x11,wayland,drm"
|
||||||
]
|
]
|
||||||
++ (optional (galliumDrivers != [])
|
++ (optional (galliumDrivers != [])
|
||||||
("--with-gallium-drivers=" +
|
("--with-gallium-drivers=" +
|
||||||
|
@ -126,7 +126,7 @@ stdenv.mkDerivation {
|
||||||
"--enable-glx"
|
"--enable-glx"
|
||||||
"--enable-glx-tls"
|
"--enable-glx-tls"
|
||||||
"--enable-gallium-osmesa" # used by wine
|
"--enable-gallium-osmesa" # used by wine
|
||||||
"--enable-gallium-llvm"
|
"--enable-llvm"
|
||||||
"--enable-egl"
|
"--enable-egl"
|
||||||
"--enable-xa" # used in vmware driver
|
"--enable-xa" # used in vmware driver
|
||||||
"--enable-gbm"
|
"--enable-gbm"
|
||||||
|
@ -152,7 +152,6 @@ stdenv.mkDerivation {
|
||||||
libX11 libXext libxcb libXt libXfixes libxshmfence
|
libX11 libXext libxcb libXt libXfixes libxshmfence
|
||||||
libffi wayland libvdpau libelf libXvMC
|
libffi wayland libvdpau libelf libXvMC
|
||||||
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
|
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
|
||||||
(python2.withPackages (ps: [ ps.Mako ]))
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,11 +11,12 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
for i in $(TARGET_DRIVERS); do \
|
for i in $(TARGET_DRIVERS); do \
|
||||||
- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \
|
- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \
|
||||||
+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \
|
+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \
|
||||||
$(DESTDIR)$(dridir)/$${i}_dri.so; \
|
$(DESTDIR)$(dridir)/$${i}_dri.so; \
|
||||||
done; \
|
done; \
|
||||||
- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*
|
- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \
|
||||||
+ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la
|
+ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la \
|
||||||
|
$(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
for i in $(TARGET_DRIVERS); do \
|
for i in $(TARGET_DRIVERS); do \
|
||||||
|
@ -60,8 +61,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${dest_dir}/$${k}; \
|
$${dest_dir}/$${k}; \
|
||||||
done; \
|
done; \
|
||||||
- $(RM) $${dest_dir}/libvdpau_gallium.*
|
- $(RM) $${dest_dir}/libvdpau_gallium.*; \
|
||||||
+ $(RM) $${dest_dir}/libvdpau_gallium.la
|
+ $(RM) $${dest_dir}/libvdpau_gallium.la \
|
||||||
|
$(RM) -d $${dest_dir} &>/dev/null || true
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
for i in $(TARGET_DRIVERS); do \
|
for i in $(TARGET_DRIVERS); do \
|
||||||
|
@ -73,7 +75,7 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
|
||||||
k=libXvMC$${i}.$(LIB_EXT); \
|
k=libXvMC$${i}.$(LIB_EXT); \
|
||||||
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
|
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
|
||||||
- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
|
- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
|
||||||
+ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
|
+ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
|
||||||
$${dest_dir}/$${l}; \
|
$${dest_dir}/$${l}; \
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
|
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
|
||||||
|
@ -81,8 +83,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${dest_dir}/$${k}; \
|
$${dest_dir}/$${k}; \
|
||||||
done; \
|
done; \
|
||||||
- $(RM) $${dest_dir}/libXvMCgallium.*
|
- $(RM) $${dest_dir}/libXvMCgallium.*; \
|
||||||
+ $(RM) $${dest_dir}/libXvMCgallium.la
|
+ $(RM) $${dest_dir}/libXvMCgallium.la \
|
||||||
|
$(RM) -d $${dest_dir} &>/dev/null || true
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
for i in $(TARGET_DRIVERS); do \
|
for i in $(TARGET_DRIVERS); do \
|
||||||
|
|
Loading…
Reference in a new issue