summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Mariański2023-06-02 23:10:25 +0200
committerŁukasz Mariański2023-06-02 23:10:25 +0200
commitfcbf3bfd22ee085457ff429a57ae7695f32ebc20 (patch)
treec9f8a56a656c8dd69ff661917ecd18d93bffe32f
parentf5e76af1e917266ab75ebc3d2b5e86a80bc8f3c3 (diff)
downloadaur-fcbf3bfd22ee085457ff429a57ae7695f32ebc20.tar.gz
use/move env vars
-rw-r--r--PKGBUILD15
-rw-r--r--alvr.patch23
2 files changed, 5 insertions, 33 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 6032e405c818..95ca177a11a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,26 +20,21 @@ options=('!lto')
source=("${pkgname}"::"git+https://github.com/alvr-org/ALVR.git#tag=v$pkgver")
md5sums=('SKIP')
+export CARGO_PROFILE_RELEASE_LTO=true
+
+export RUSTUP_TOOLCHAIN=stable
+export CARGO_TARGET_DIR=target
+
prepare() {
cd "$srcdir/${pkgname}"
sed -i 's:../../../lib64/libalvr_vulkan_layer.so:libalvr_vulkan_layer.so:' alvr/vulkan_layer/layer/alvr_x86_64.json
- echo "
-[profile.release]
-lto=true" >>Cargo.toml
-
- export RUSTUP_TOOLCHAIN=stable
- export CARGO_TARGET_DIR=target
-
cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
}
build() {
cd "$srcdir/${pkgname}"
- export RUSTUP_TOOLCHAIN=stable
- export CARGO_TARGET_DIR=target
-
export ALVR_ROOT_DIR=/usr
export ALVR_LIBRARIES_DIR="$ALVR_ROOT_DIR/lib"
diff --git a/alvr.patch b/alvr.patch
deleted file mode 100644
index 7c67fad846b9..000000000000
--- a/alvr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6fbf326871683dabfcb3b33448482c5b303d4bef Mon Sep 17 00:00:00 2001
-Date: Fri, 7 Apr 2023 14:36:35 +0200
-Subject: [PATCH] layer patch
-
----
- alvr/vulkan_layer/layer/layer.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/alvr/vulkan_layer/layer/layer.h b/alvr/vulkan_layer/layer/layer.h
-index b17f8e58..8676ec53 100644
---- a/alvr/vulkan_layer/layer/layer.h
-+++ b/alvr/vulkan_layer/layer/layer.h
-@@ -2,6 +2,7 @@
-
- #include <vulkan/vk_layer.h>
-
-+#define VK_LAYER_EXPORT __attribute__((visibility("default")))
- extern "C" const char *g_sessionPath;
-
- extern "C" VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL wsi_layer_vkGetDeviceProcAddr(VkDevice device, const char *funcName);
---
-2.40.0
-