summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--patch2.diff80
3 files changed, 92 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2007b91cb9f..5829746ba56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Feb 22 23:00:00 UTC 2016
+# Tue Feb 23 00:38:59 UTC 2016
pkgbase = renderdoc
pkgdesc = OpenGL and Vulkan debugging tool
pkgver = 0.27
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/baldurk/renderdoc
arch = i686
arch = x86_64
@@ -11,8 +11,12 @@ pkgbase = renderdoc
depends = qt5-x11extras
source = https://github.com/baldurk/renderdoc/archive/v0.27.tar.gz
source = renderdoc.desktop
+ source = patch1.diff
+ source = patch2.diff
sha256sums = bcb3dba88d07c57ba84830578da9b49c56ff5071e33b3f97bdeb265fb0040a63
sha256sums = eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984
+ sha256sums = f166de9d2bb46b8d64e73e7e8afe026525ecfb58d47fc5dacf0b0fff7a57adf2
+ sha256sums = bfcc7d9deb98110848f9376b490cc5b182aa90fd673beb822b56e5d21ae75b38
pkgname = renderdoc
diff --git a/PKGBUILD b/PKGBUILD
index f77ba179e95..4347eaefdb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,23 @@
pkgname=renderdoc
pkgver=0.27
-pkgrel=2
+pkgrel=3
pkgdesc="OpenGL and Vulkan debugging tool"
arch=(i686 x86_64)
url="https://github.com/baldurk/renderdoc"
license=("MIT")
depends=(qt5-x11extras)
-makedepends=(git)
-source=("https://github.com/baldurk/renderdoc/archive/v$pkgver.tar.gz" "$pkgname.desktop" "patch1.diff")
+source=("https://github.com/baldurk/renderdoc/archive/v$pkgver.tar.gz"
+ "$pkgname.desktop" "patch1.diff" "patch2.diff")
sha256sums=('bcb3dba88d07c57ba84830578da9b49c56ff5071e33b3f97bdeb265fb0040a63'
'eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984'
- 'f166de9d2bb46b8d64e73e7e8afe026525ecfb58d47fc5dacf0b0fff7a57adf2')
+ 'f166de9d2bb46b8d64e73e7e8afe026525ecfb58d47fc5dacf0b0fff7a57adf2'
+ 'bfcc7d9deb98110848f9376b490cc5b182aa90fd673beb822b56e5d21ae75b38')
build() {
cd $pkgname-$pkgver
patch -p1 < ../patch1.diff
+ patch -p1 < ../patch2.diff
make
}
diff --git a/patch2.diff b/patch2.diff
new file mode 100644
index 00000000000..09d9be2aa90
--- /dev/null
+++ b/patch2.diff
@@ -0,0 +1,80 @@
+diff --git a/calc_hash.sh b/calc_hash.sh
+new file mode 100644
+index 0000000..e230e21
+--- /dev/null
++++ b/calc_hash.sh
+@@ -0,0 +1,2 @@
++#!/bin/bash
++git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED
+diff --git a/hash_version.sh b/hash_version.sh
+index 5d52bd1..b014be5 100644
+--- a/hash_version.sh
++++ b/hash_version.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+
+-GIT_HASH=`git rev-parse HEAD`;
++GIT_HASH=`sh ./calc_hash.sh`;
+
+ rm -f ver
+ sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/data/resource.h > ver && mv ver renderdoc/data/resource.h
+diff --git a/renderdoc/Makefile b/renderdoc/Makefile
+index fc7ffac..3c5da50 100644
+--- a/renderdoc/Makefile
++++ b/renderdoc/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPP=g++
+-COMMIT=`git rev-parse HEAD`
++COMMIT=`sh ../calc_hash.sh`
+ MACROS=-DLINUX \
+ -DRENDERDOC_PLATFORM=linux \
+ -DRENDERDOC_EXPORTS \
+diff --git a/renderdoc/driver/gl/Makefile b/renderdoc/driver/gl/Makefile
+index 2552d95..abc1209 100644
+--- a/renderdoc/driver/gl/Makefile
++++ b/renderdoc/driver/gl/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPP=g++
+-COMMIT=`git rev-parse HEAD`
++COMMIT=`sh ../../../calc_hash.sh`
+ MACROS=-DLINUX \
+ -DRENDERDOC_PLATFORM=linux \
+ -DRENDERDOC_EXPORTS \
+diff --git a/renderdoc/driver/shaders/spirv/Makefile b/renderdoc/driver/shaders/spirv/Makefile
+index deed81d..ea61c09 100644
+--- a/renderdoc/driver/shaders/spirv/Makefile
++++ b/renderdoc/driver/shaders/spirv/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPP=g++
+-COMMIT=`git rev-parse HEAD`
++COMMIT=`sh ../../../../calc_hash.sh`
+ MACROS=-DLINUX \
+ -DRENDERDOC_PLATFORM=linux \
+ -DRENDERDOC_EXPORTS \
+diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
+index 6491cf3..3f2c426 100644
+--- a/renderdoc/driver/vulkan/Makefile
++++ b/renderdoc/driver/vulkan/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPP=g++
+-COMMIT=`git rev-parse HEAD`
++COMMIT=`sh ../../../calc_hash.sh`
+ MACROS=-DLINUX \
+ -DRENDERDOC_PLATFORM=linux \
+ -DRENDERDOC_EXPORTS \
+diff --git a/renderdoccmd/Makefile b/renderdoccmd/Makefile
+index 94af9ef..88d1100 100644
+--- a/renderdoccmd/Makefile
++++ b/renderdoccmd/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPP=g++
+-COMMIT=`git rev-parse HEAD`
++COMMIT=`sh ../calc_hash.sh`
+ MACROS=-DLINUX \
+ -DRENDERDOC_PLATFORM=linux \
+ -DGIT_COMMIT_HASH="\"$(COMMIT)\""