diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa')
4 files changed, 584 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix new file mode 100644 index 000000000000..b34ca5253a29 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -0,0 +1,375 @@ +{ stdenv, fetchurl, fetchpatch, lib +, pkgconfig, autoreconfHook, python2, python2Packages +, expat, zlib +, OpenGL, Xplugin + +, enableRadv ? stdenv.isLinux + +, galliumDrivers ? null +, driDrivers ? null +, vulkanDrivers ? null +, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, xorg, wayland, wayland-protocols + +, xvmcSupport ? true +, vdpauSupport ? true, libvdpau +, omxBellagioSupport ? stdenv.isLinux, libomxil-bellagio +, vaSupport ? stdenv.isLinux, libva-minimal +, libdrmSupport ? stdenv.isLinux, libdrm +, libelfSupport ? stdenv.isLinux, libelf +, llvmSupport ? true, llvmPackages +, libglvndSupport ? true, libglvnd +, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light +}: + +with lib; + +assert elem "drm" eglPlatforms -> libdrmSupport; +assert elem "wayland" eglPlatforms -> libdrmSupport; +assert xvmcSupport -> elem "x11" eglPlatforms; +assert vdpauSupport -> elem "x11" eglPlatforms; +assert enableRadv -> libdrmSupport && llvmSupport && libelfSupport; + +/** Packaging design: + - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now). + This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) + and are designed to be the buildInput of other packages. + - DRI drivers are compiled into $drivers output, which is much bigger and + depends on LLVM. These should be searched at runtime in + "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). + (I suppose on non-NixOS one would create the appropriate symlinks from there.) + - libOSMesa is in $osmesa (~4 MB) +*/ + +let + # platforms that have PCIe slots and thus can use most non-integrated GPUs + pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64; + defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ] + ++ optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] + ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ] + ++ optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] + ++ optionals stdenv.hostPlatform.isx86 [ "svga" "i915" ] + ++ optional (pciePlatform && llvmSupport) "r300" + ++ optionals (pciePlatform && llvmSupport && libelfSupport) [ "r600" "radeonsi" ]); + + defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ] + ++ optionals pciePlatform [ "radeon" "r200" ] + ++ optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] + ++ optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]); + + defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ] + ++ optional (libdrmSupport && stdenv.hostPlatform.isx86) "intel" + ++ optional enableRadv "radeon"); + + gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; +in + +let + galliumDrivers = + (if gallium_ == null + then defaultGalliumDrivers + else gallium_) + ++ optional stdenv.isLinux "swrast"; + driDrivers = + (if dri_ == null + then optionals (elem "drm" eglPlatforms) defaultDriDrivers + else dri_) ++ optional stdenv.isLinux "swrast"; + vulkanDrivers = + if vulkan_ == null + then defaultVulkanDrivers + else vulkan_; + + version = "18.3.4"; + branch = head (splitString "." version); + + self = + assert xvmcSupport -> + elem "r600" galliumDrivers || elem "nouveau" galliumDrivers; + assert omxBellagioSupport -> + intersectLists galliumDrivers [ "r600" "radeonsi" "nouveau" ] != []; + assert vaSupport -> + intersectLists galliumDrivers [ "r600" "radeonsi" "nouveau" ] != []; + assert vdpauSupport -> + intersectLists galliumDrivers [ "r300" "r600" "radeonsi" "nouveau" ] != []; + + stdenv.mkDerivation { + name = "mesa-noglu-${version}"; + + src = fetchurl { + urls = [ + "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" + "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" + "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" + "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" + ]; + sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"; + }; + + prePatch = "patchShebangs ."; + + # TODO: + # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved + # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog + patches = [ + ./symlink-drivers.patch + ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl + ./disk_cache-include-dri-driver-path-in-cache-key.patch + + (fetchpatch { + url = https://cgit.freedesktop.org/mesa/mesa/patch/?id=eb44c36cf1729e7e200b77cf8ea755dff72d1639; + sha256 = "1izp38yja917241y7qslbkbmxv5ll9746ivgg2q5s64cwiydwrcc"; + }) + (fetchpatch { + url = https://cgit.freedesktop.org/mesa/mesa/patch/?id=bcc4bfc8e80da5dc4c6ee44f791f2112dac208d1; + sha256 = "0rijkx80anbb7g14cg9g11ha7lcf7sixc7xsjam6myyd68nl3n5n"; + }) + ]; + + outputs = [ "out" "dev" "drivers" ] + ++ optional (elem "swrast" galliumDrivers) "osmesa"; + + # TODO: Figure out how to enable opencl without having a runtime dependency on clang + configureFlags = [ + "--sysconfdir=${libglvnd.driverLink}/etc" + "--localstatedir=/var" + "--with-dri-driverdir=$(drivers)/lib/dri" + "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" + "--with-va-libdir=$(drivers)/lib/dri" + "--with-platforms=${concatStringsSep "," eglPlatforms}" + "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}" + "--with-dri-drivers=${concatStringsSep "," driDrivers}" + "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}" + "--with-d3d-libdir=$(drivers)/lib" + "--with-xvmc-libdir=$(drivers)/lib" + "--with-vdpau-libdir=$(drivers)/lib" + "--with-omx-bellagio-libdir=$(drivers)/lib" + "--enable-texture-float" + "--enable-shared-glapi" + "--enable-llvm-shared-libs" + + # XXX: I'm not sure whether x11 is actually required in theory for + # dri3, but attempting to build with dri3 and without x11 + # results in a compile error. For future versions, check + # whether this is still the case and remove the check if not: + # + # Last checked: v18.3.4 + (enableFeature (stdenv.isLinux && elem "x11" eglPlatforms && libdrmSupport) "dri3") + + # Direct3D in Wine + (enableFeature (any (d: d != "swrast") galliumDrivers) "nine") + + (enableFeature libglvndSupport "libglvnd") + "--enable-dri" + "--enable-driglx-direct" + "--enable-gles1" + "--enable-gles2" + (enableFeature (elem "x11" eglPlatforms && libdrmSupport) "glx") + + # https://bugs.freedesktop.org/show_bug.cgi?id=35268 + (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls") + + # used by wine + (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa") + + (enableFeature llvmSupport "llvm") + (enableFeature stdenv.isLinux "egl") + + # used in vmware driver + (enableFeature (any (d: d != "swrast") galliumDrivers) "xa") + + (enableFeature libdrmSupport "gbm") + (enableFeature xvmcSupport "xvmc") + (enableFeature vdpauSupport "vdpau") + (enableFeature omxBellagioSupport "omx-bellagio") + (enableFeature vaSupport "va") + "--disable-opencl" + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig python2 ] + ++ optionals enableRadv [ python2Packages.Mako ]; + + propagatedBuildInputs = + optionals (elem "x11" eglPlatforms) (with xorg; [ libXdamage libXxf86vm ]) + ++ optional libdrmSupport libdrm + ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; + + buildInputs = [ expat zlib ] + ++ optional libglvndSupport libglvnd + ++ optional llvmSupport llvmPackages.llvm + ++ optional libelfSupport libelf + ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] + ++ optional xvmcSupport xorg.libXvMC + ++ optional vdpauSupport libvdpau + ++ optional vaSupport libva-minimal + ++ optional omxBellagioSupport libomxil-bellagio + ++ optional withValgrind valgrind-light + + ++ optionals (elem "x11" eglPlatforms) + ((with xorg; [ xorgproto libX11 ])) + + ++ optionals (elem "x11" eglPlatforms && libdrmSupport) + (with xorg; [ libXext libxcb libxshmfence ]) + + ++ optional (elem "x11" eglPlatforms && elem "drm" eglPlatforms) + xorg.libXrandr; + + enableParallelBuilding = true; + doCheck = false; + + installFlags = [ + "sysconfdir=\${drivers}/etc" + "localstatedir=\${TMPDIR}" + "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" + ]; + + # TODO: probably not all .la files are completely fixed, but it shouldn't matter; + postInstall = '' + # Some installs don't have any drivers so this directory is never created. + mkdir -p $drivers + '' + optionalString (galliumDrivers != []) '' + # move libOSMesa to $osmesa, as it's relatively big + mkdir -p {$osmesa,$drivers}/lib/ + mv -t $osmesa/lib/ $out/lib/libOSMesa* + + # now fix references in .la files + sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la + + # set the default search path for DRI drivers; used e.g. by X server + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}" + + # remove GLES libraries; they are provided by libglvnd + rm $out/lib/lib{GLESv1_CM,GLESv2}.* + + # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL. + rm -f $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc + + # move vendor files + mv $out/share/ $drivers/ + + # Update search path used by glvnd + for js in $drivers/share/glvnd/egl_vendor.d/*.json; do + substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + done + + # Update search path used by pkg-config + substituteInPlace $dev/lib/pkgconfig/dri.pc --replace $out $drivers + '' + optionalString (vulkanDrivers != []) '' + # Update search path used by Vulkan (it's pointing to $out but + # drivers are in $drivers) + for js in $drivers/share/vulkan/icd.d/*.json; do + substituteInPlace "$js" --replace "$out" "$drivers" + done + '' + optionalString (any (d: d != "swrast") galliumDrivers) '' + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/{d3d,xatracker}.pc; do + substituteInPlace "$pc" --replace $out $drivers + done + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + mv $out/lib/libxatracker* $drivers/lib + '' + optionalString (vulkanDrivers != []) '' + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + mv $out/lib/libvulkan_* $drivers/lib + '' + optionalString libglvndSupport '' + # Move other drivers to a separate output + mv $out/lib/lib*_mesa* $drivers/lib + ''; + + # TODO: + # check $out doesn't depend on llvm: builder failures are ignored + # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; + postFixup = optionalString (galliumDrivers != []) '' + # add RPATH so the drivers can find the moved libgallium and libdricore9 + # moved here to avoid problems with stripping patchelfed files + for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do + if [[ ! -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" + fi + done + ''; + + passthru = { + inherit libdrm version; + inherit (libglvnd) driverLink; + + # Use stub libraries from libglvnd and headers from Mesa. + stubs = stdenv.mkDerivation { + name = "libGL-${libglvnd.version}"; + outputs = [ "out" "dev" ]; + + # On macOS, libglvnd is not supported, so we just use what mesa + # build. We need to also include OpenGL.framework, and some + # extra tricks to go along with. We add mesa’s libGLX to support + # the X extensions to OpenGL. + buildCommand = if stdenv.hostPlatform.isDarwin then '' + mkdir -p $out/nix-support $dev + echo ${OpenGL} >> $out/nix-support/propagated-build-inputs + ln -s ${self.out}/lib $out/lib + + mkdir -p $dev/lib/pkgconfig $dev/nix-support + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + cat <<EOF >$dev/lib/pkgconfig/gl.pc + Name: gl + Description: gl library + Version: ${self.version} + Libs: -L${self.out}/lib -lGL + Cflags: -I${self.dev}/include + EOF + + cat <<EOF >$dev/lib/pkgconfig/glesv1_cm.pc + Name: glesv1_cm + Description: glesv1_cm library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv1_CM + Cflags: -I${self.dev}/include + EOF + + cat <<EOF >$dev/lib/pkgconfig/glesv2.pc + Name: glesv2 + Description: glesv2 library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv2 + Cflags: -I${self.dev}/include + EOF + '' + + # Otherwise, setup gl stubs to use libglvnd. + else '' + mkdir -p $out/nix-support + ln -s ${libglvnd.out}/lib $out/lib + + mkdir -p $dev/{,lib/pkgconfig,nix-support} + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + genPkgConfig() { + local name="$1" + local lib="$2" + + cat <<EOF >$dev/lib/pkgconfig/$name.pc + Name: $name + Description: $lib library + Version: ${self.version} + Libs: -L${libglvnd.out}/lib -l$lib + Cflags: -I${self.dev}/include + EOF + } + + genPkgConfig gl GL + genPkgConfig egl EGL + genPkgConfig glesv1_cm GLESv1_CM + genPkgConfig glesv2 GLESv2 + ''; + }; + }; + + meta = { + description = "An open source implementation of OpenGL"; + homepage = https://www.mesa3d.org/; + license = licenses.mit; # X11 variant, in most files + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ vcunat ]; + }; + }; +in self diff --git a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch new file mode 100644 index 000000000000..37813db89347 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -0,0 +1,52 @@ +From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Mon, 6 Aug 2018 15:52:11 -0300 +Subject: [PATCH] disk_cache: include dri driver path in cache key + +This fixes invalid cache hits on NixOS where all shared library +timestamps in /nix/store are zero. +--- + src/util/Makefile.am | 3 +++ + src/util/disk_cache.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index bafb57439a..a22e2e41eb 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \ + libmesautil.la \ + libxmlconfig.la + ++AM_CFLAGS = \ ++ -DDISK_CACHE_KEY=\"$(drivers)\" ++ + AM_CPPFLAGS = \ + $(PTHREAD_CFLAGS) \ + -I$(top_srcdir)/include +diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c +index 368ec41792..071220b2ba 100644 +--- a/src/util/disk_cache.c ++++ b/src/util/disk_cache.c +@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, + + /* Create driver id keys */ + size_t id_size = strlen(driver_id) + 1; ++ size_t key_size = strlen(DISK_CACHE_KEY) + 1; + size_t gpu_name_size = strlen(gpu_name) + 1; + cache->driver_keys_blob_size += id_size; ++ cache->driver_keys_blob_size += key_size; + cache->driver_keys_blob_size += gpu_name_size; + + /* We sometimes store entire structs that contains a pointers in the cache, +@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, + uint8_t *drv_key_blob = cache->driver_keys_blob; + DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) + DRV_KEY_CPY(drv_key_blob, driver_id, id_size) ++ DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size) + DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size) + DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) + DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) +-- +2.19.1 + diff --git a/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch new file mode 100644 index 000000000000..18e7d5437b15 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch @@ -0,0 +1,45 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include <pthread.h> ++ + #define MAXTHREADS 1 + + struct threadpool { +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include <sys/types.h> + #include <sys/file.h> ++#include <sys/stat.h> + #include <unistd.h> + #include <fcntl.h> + #else +--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +@@ -28,6 +28,8 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include <sys/types.h> ++ + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h"<Paste> diff --git a/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch b/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch new file mode 100644 index 000000000000..af2ec9fdb096 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch @@ -0,0 +1,112 @@ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.3/src/gallium/targets/dri/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -134,14 +134,13 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# gallium_dri.so in the set of final installed files. ++# symlink each megadriver instance. + install-data-hook: + for i in $(TARGET_DRIVERS); do \ +- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \ ++ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \ + $(DESTDIR)$(dridir)/$${i}_dri.so; \ + done; \ +- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \ ++ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la \ + $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am mesa-12.0.3/src/gallium/targets/va/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/va/Makefile.am 2016-09-22 14:45:39.635963339 +0200 +@@ -71,10 +71,10 @@ + # gallium_drv_video.so in the set of final installed files. + install-data-hook: + for i in $(TARGET_DRIVERS); do \ +- ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ ++ ln -srf $(DESTDIR)$(vadir)/gallium_drv_video.so \ + $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ + done; \ +- $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* ++ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -103,15 +103,14 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# libvdpau_gallium.so in the set of final installed files. ++# symlink each megadriver instance. + install-data-hook: + $(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \ + for i in $(TARGET_DRIVERS); do \ + j=libvdpau_gallium.$(LIB_EXT); \ + k=libvdpau_$${i}.$(LIB_EXT); \ + l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ ++ ln -srf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +@@ -120,7 +119,7 @@ + ln -sf $${l} \ + $${dest_dir}/$${k}; \ + done; \ +- $(RM) $${dest_dir}/libvdpau_gallium.*; \ ++ $(RM) $${dest_dir}/libvdpau_gallium.la \ + $(RM) -d $${dest_dir} &>/dev/null || true + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am 2016-09-22 14:54:22.291014543 +0200 +@@ -73,7 +73,7 @@ + j=libXvMCgallium.$(LIB_EXT); \ + k=libXvMC$${i}.$(LIB_EXT); \ + l=$${k}.$(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 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ +@@ -82,7 +82,7 @@ + ln -sf $${l} \ + $${dest_dir}/$${k}; \ + done; \ +- $(RM) $${dest_dir}/libXvMCgallium.*; \ ++ $(RM) $${dest_dir}/libXvMCgallium.la \ + $(RM) -d $${dest_dir} &>/dev/null || true + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am mesa-12.0.3/src/mesa/drivers/dri/Makefile.am +--- mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/mesa/drivers/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -94,14 +94,13 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# mesa_dri_drivers.so in the set of final installed files. ++# symink each megadriver instance. + install-data-hook: + for i in $(MEGADRIVERS); do \ +- ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ ++ ln -srf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ + $(DESTDIR)$(dridir)/$$i; \ + done; +- $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.* ++ $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.la + + uninstall-hook: + for i in $(MEGADRIVERS); do \ |