[arch-commits] Commit in openvr/repos/community-x86_64 (3 files)

[Bruno Pagani]

    Date: Monday, March 15, 2021 @ 02:27:32
  Author: archange
Revision: 891373

archrelease: copy trunk to community-x86_64

Added:
  openvr/repos/community-x86_64/0001-Add-include-stdarg.h-to-strtools_public.cpp.patch
    (from rev 891372, openvr/trunk/0001-Add-include-stdarg.h-to-strtools_public.cpp.patch)
  openvr/repos/community-x86_64/PKGBUILD
    (from rev 891372, openvr/trunk/PKGBUILD)
Deleted:
  openvr/repos/community-x86_64/PKGBUILD

--------------------------------------------------------+
 0001-Add-include-stdarg.h-to-strtools_public.cpp.patch |   25 ++++
 PKGBUILD                                               |   81 ++++++++-------
 2 files changed, 69 insertions(+), 37 deletions(-)

Copied: openvr/repos/community-x86_64/0001-Add-include-stdarg.h-to-strtools_public.cpp.patch (from rev 891372, openvr/trunk/0001-Add-include-stdarg.h-to-strtools_public.cpp.patch)
===================================================================
--- 0001-Add-include-stdarg.h-to-strtools_public.cpp.patch	                        (rev 0)
+++ 0001-Add-include-stdarg.h-to-strtools_public.cpp.patch	2021-03-15 02:27:32 UTC (rev 891373)
@@ -0,0 +1,25 @@
+From 75e74794ecfd8cf5f0ba0086eca59ab6041e18c5 Mon Sep 17 00:00:00 2001
+From: Christoph Haag <christoph.haag at collabora.com>
+Date: Fri, 12 Mar 2021 12:29:02 +0100
+Subject: [PATCH] Add #include <stdarg.h> to strtools_public.cpp
+
+Required for va_start and va_end
+---
+ src/vrcommon/strtools_public.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/vrcommon/strtools_public.cpp b/src/vrcommon/strtools_public.cpp
+index 3193f7e..10b8419 100644
+--- a/src/vrcommon/strtools_public.cpp
++++ b/src/vrcommon/strtools_public.cpp
+@@ -10,6 +10,7 @@
+ #include <functional>
+ #include <locale>
+ #include <codecvt>
++#include <stdarg.h>
+ 
+ #if defined( _WIN32 )
+ #include <windows.h>
+-- 
+2.30.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-15 02:27:02 UTC (rev 891372)
+++ PKGBUILD	2021-03-15 02:27:32 UTC (rev 891373)
@@ -1,37 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=openvr
-pkgver=1.14.15
-pkgrel=3
-pkgdesc="API and runtime that allows access to VR hardware from multiple vendors"
-arch=(x86_64)
-url="https://github.com/ValveSoftware/openvr"
-license=(custom)
-depends=(jsoncpp libgl)
-makedepends=(cmake)
-source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        openvr-fix-vsprintf_s.patch::${url}/pull/594.patch
-        openvr-use-system-jsoncpp.patch::${url}/pull/1178.patch)
-sha256sums=('40644e569f057e86c733d818a22d821c640307e5058d95958414422134d79584'
-            '29715711e5b28e2ce2934ef21cb5e6cfd05eec7f9d47b3e9b674a6d72ca8623a'
-            'a230a1f9fdf356766b27e7765fc2929344bd17edc3e7e67eb479cb016a3d8981')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  rm -rf thirdparty/jsoncpp
-  patch -Np1 -i ../openvr-fix-vsprintf_s.patch
-  patch -Np1 -i ../openvr-use-system-jsoncpp.patch
-}
-
-build() {
-  cmake -B build -S ${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_SHARED=1 \
-    -DUSE_SYSTEM_JSONCPP=True
-  make -C build
-}
-
-package() {
-  make -C build DESTDIR="${pkgdir}" install
-  install -Dm644 ${pkgname}-${pkgver}/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}

Copied: openvr/repos/community-x86_64/PKGBUILD (from rev 891372, openvr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-15 02:27:32 UTC (rev 891373)
@@ -0,0 +1,44 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Christoph Haag <christoph.haag at collabora.com>
+
+pkgname=openvr
+pkgver=1.16.8
+pkgrel=1
+pkgdesc="API and runtime that allows access to VR hardware from multiple vendors"
+arch=(x86_64)
+url="https://github.com/ValveSoftware/openvr"
+license=(custom)
+depends=(jsoncpp libgl)
+makedepends=(cmake)
+source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        openvr-fix-vsprintf_s.patch::${url}/pull/594.patch
+        openvr-use-system-jsoncpp.patch::${url}/pull/1178.patch
+        openvr-fix-1.6.18-include.patch::${url}/pull/1524.patch
+        0001-Add-include-stdarg.h-to-strtools_public.cpp.patch)
+sha256sums=('387c98c0540f66595c4594e5f3340a1095dd90e954ff14fd5d89cc849ba32d1b'
+            '29715711e5b28e2ce2934ef21cb5e6cfd05eec7f9d47b3e9b674a6d72ca8623a'
+            'a230a1f9fdf356766b27e7765fc2929344bd17edc3e7e67eb479cb016a3d8981'
+            '93a39df6a5d41f87b766cc7ec0fc3e49d6cc97f88b84a642fc26c9fe07cdf54c'
+            'ccb5672d1ec4ce75c8a15700be17b29f743245db0a015bff4ca8a416c037838b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  rm -rf thirdparty/jsoncpp
+  patch -Np1 -i ../openvr-fix-vsprintf_s.patch
+  patch -Np1 -i ../openvr-use-system-jsoncpp.patch
+  patch -Np1 -i ../openvr-fix-1.6.18-include.patch
+  patch -Np1 -i ../0001-Add-include-stdarg.h-to-strtools_public.cpp.patch
+}
+
+build() {
+  cmake -B build -S ${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED=1 \
+    -DUSE_SYSTEM_JSONCPP=True
+  make -C build
+}
+
+package() {
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm644 ${pkgname}-${pkgver}/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}