mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 02:06:46 +01:00
1f407a46d6
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.
113 lines
5 KiB
Diff
113 lines
5 KiB
Diff
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 \
|