[arch-commits] Commit in vulkan-intel/trunk (PKGBUILD fixes.patch)

[Laurent Carlier]

    Date: Monday, April 18, 2016 @ 07:58:20
  Author: lcarlier
Revision: 265110

upgpkg: vulkan-intel 0.0.3+3713+ga998e49-1

update to lastest git commit,fix FS#48964

Added:
  vulkan-intel/trunk/fixes.patch
Modified:
  vulkan-intel/trunk/PKGBUILD

-------------+
 PKGBUILD    |   28 +++++++++++++++-------------
 fixes.patch |   23 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-18 02:05:10 UTC (rev 265109)
+++ PKGBUILD	2016-04-18 05:58:20 UTC (rev 265110)
@@ -2,20 +2,22 @@
 # Maintainer: Laurent Carlier <lordheavym at gmail.com>
 
 pkgname=vulkan-intel
-pkgver=0.0.2+3381+gbff7a8c
-#pkgver=11.2+branchpoint+3381+gbff7a8c
+pkgver=0.0.3+3713+ga998e49
+#pkgver=11.2+branchpoint+3713+ga998e49
 pkgrel=1
 pkgdesc="Intel's Vulkan mesa driver"
-arch=(x86_64) # i686 doesn't build
+arch=(x86_64 i686)
 url="http://www.mesa3d.org"
 license=('custom')
-depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb')
-makedepends=('libdrm' 'dri2proto' 'glproto' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1' 'libxmu'
+depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb' 'libxshmfence')
+makedepends=('libdrm' 'dri3proto' 'glproto' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1' 'libxmu'
              'talloc' 'wayland' 'pkgconfig' 'imake' 'xorg-server-devel' 'python2-mako' 'python' 'git')
-source=('anvil::git://anongit.freedesktop.org/mesa/mesa#branch=vulkan'
-        LICENSE) 
+source=('anvil::git://anongit.freedesktop.org/mesa/mesa#commit=a998e492594df333834131dbe705b4023ef7e929'
+        LICENSE
+        fixes.patch) 
 sha256sums=('SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            'f2b490dacd654d7c810481a0025f200fc864cdd4d8d647ece9815cc83903265e')
 
 # pkgver() {
 #   cd $pkgname
@@ -24,9 +26,8 @@
 
 prepare() {
   cd "${srcdir}/anvil"
-  
-  #select our git commit
-  git checkout bff7a8c4f343a67149e6a6854e0597696b3d4b03 .
+
+  patch -Np1 -i ../fixes.patch  
 }
 
 build() {
@@ -37,6 +38,7 @@
     --with-sha1=libgcrypt \
     --with-dri-drivers=i965 \
     --with-egl-platforms=x11,drm,wayland \
+    --with-vulkan-drivers=intel \
     --with-gallium-drivers=
   make
 
@@ -48,8 +50,8 @@
 package() {
   cd "${srcdir}/anvil"
   
-  install -m755 -d ${pkgdir}/etc
-  mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/
+  install -m755 -d ${pkgdir}/usr/share
+  mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/usr/share
 
   install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
   mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/

Added: fixes.patch
===================================================================
--- fixes.patch	                        (rev 0)
+++ fixes.patch	2016-04-18 05:58:20 UTC (rev 265110)
@@ -0,0 +1,23 @@
+diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
+index cba6671..a84be72 100644
+--- a/src/intel/vulkan/Makefile.am
++++ b/src/intel/vulkan/Makefile.am
+@@ -67,7 +67,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/src/compiler/nir \
+ 	-I$(top_builddir)/src/intel
+ 
+-libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init
++libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init -msse2
+ 
+ VULKAN_SOURCES =                                        \
+ 	anv_allocator.c                                 \
+diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
+index cba6671..5aedef8 100644
+--- a/src/intel/vulkan/Makefile.am
++++ b/src/intel/vulkan/Makefile.am
+@@ -209,4 +209,4 @@ libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD)
+ include $(top_srcdir)/install-lib-links.mk
+ 
+ install-data-local:
+-	$(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(VULKAN_ICD_INSTALL_DIR)/intel_icd.json
++	$(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(DESTDIR)/$(VULKAN_ICD_INSTALL_DIR)/intel_icd.json