update to v1.0

3 files changed, 27 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 539379b45b1b..95b59e4e30d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = renderdoc-git
 	pkgdesc = OpenGL and Vulkan debugging tool
-	pkgver = r3059.d98c29b
+	pkgver = 1.0+42.g714b37ded5
 	pkgrel = 1
 	url = https://github.com/baldurk/renderdoc
 	arch = i686
 	arch = x86_64
 	license = MIT
+	depends = libx11
+	depends = libxcb
+	depends = mesa
+	depends = libgl
+	depends = qt5-base
+	depends = qt5-svg
 	depends = qt5-x11extras
+	depends = xcb-util-keysyms
 	provides = renderdoc
 	conflicts = renderdoc
 	source = https://github.com/baldurk/renderdoc
 	source = renderdoc.desktop
-	source = cflags.patch
 	sha256sums = SKIP
 	sha256sums = eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984
-	sha256sums = 21ba3fb37c0db0c9772ab3229431fc365289ae5e25eb7cb345632f2e87f74195
 
 pkgname = renderdoc-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a51a59f33cb1..9efca67302ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,62 +2,41 @@
 # Contributor: Hubert Jarosz <marqin.pl+aur at gmail dot com> PGP: 0xFFECF63C1AAB83FF
 
 pkgname=renderdoc-git
-pkgver=r3059.d98c29b
+pkgver=1.0+42.g714b37ded5
 pkgrel=1
 pkgdesc="OpenGL and Vulkan debugging tool"
 arch=(i686 x86_64)
 url="https://github.com/baldurk/renderdoc"
 license=("MIT")
-depends=(qt5-x11extras)
-source=("git+https://github.com/baldurk/renderdoc"
-        "renderdoc.desktop"
-        "cflags.patch")
+depends=("libx11" "libxcb" "mesa" "libgl" "qt5-base" "qt5-svg" "qt5-x11extras" "xcb-util-keysyms")
+source=("git+https://github.com/baldurk/renderdoc#branch=v1.x"
+        "renderdoc.desktop")
 sha256sums=('SKIP'
-            'eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984'
-            '21ba3fb37c0db0c9772ab3229431fc365289ae5e25eb7cb345632f2e87f74195')
+            'eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984')
 conflicts=('renderdoc')
 provides=('renderdoc')
 
 pkgver() {
   cd "${srcdir}"/renderdoc
-  printf "r%d.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd "${srcdir}"/renderdoc
-  patch -sp1 -i ../cflags.patch
+  git describe --always --abbrev=10 HEAD |
+    sed 's/^v//; s/-/+/; s/-/./'
 }
 
 build() {
-  cd "${srcdir}"/renderdoc
-
-  mkdir -p build
-  pushd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_QRENDERDOC=OFF \
-    ..
-  make
-  popd
-
-  pushd qrenderdoc
-  qmake "CONFIG+=release" "DESTDIR=${srcdir}/renderdoc/build/bin" .
-  make
-  popd
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_VERSION_STABLE=ON \
+        -DBUILD_VERSION_DIST_CONTACT="https://aur.archlinux.org/packages/renderdoc-git" \
+        -DBUILD_VERSION_DIST_NAME="Arch" \
+        -DBUILD_VERSION_DIST_VER="$(pkgver)" \
+        -B"${srcdir}/renderdoc"/build \
+        -H"${srcdir}/renderdoc"
+  cmake --build "${srcdir}/renderdoc"/build
 }
 
 package() {
-  cd "${srcdir}"
-  install -Dm644 renderdoc.desktop "$pkgdir/usr/share/applications/renderdoc.desktop"
-
-  cd "${srcdir}"/renderdoc/build/bin
-  install -Dm644 librenderdoc.so "$pkgdir/usr/lib/librenderdoc.so"
-  install -Dm755 qrenderdoc "$pkgdir/usr/bin/qrenderdoc"
-  install -Dm755 renderdoccmd "$pkgdir/usr/bin/"
-
-  cd "${srcdir}"/renderdoc
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  make DESTDIR="${pkgdir}" -C "${srcdir}/renderdoc"/build install
 
-  cd "${srcdir}"/renderdoc/docs/imgs
-  install -Dm644 logo.png "$pkgdir/usr/share/icons/renderdoc.png"
+  install -Dm644 "${srcdir}"/renderdoc.desktop "$pkgdir/usr/share/applications/renderdoc.desktop"
+  install -Dm644 "${srcdir}"/renderdoc/docs/imgs/logo.png "$pkgdir/usr/share/icons/renderdoc.png"
 }
diff --git a/cflags.patch b/cflags.patch
deleted file mode 100644
index a139cb837a7b..000000000000
--- a/cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c63a6b..a1a6639 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-         -Wno-unused-parameter
-         -Wno-missing-field-initializers
-         -Wno-unknown-pragmas
-+        -Wno-shift-negative-value
-+        -Wno-strict-aliasing
-         -Wno-reorder)
-     if(CMAKE_COMPILER_IS_GNUCXX)
-         list(APPEND warning_flags -Wno-unused-but-set-variable)