From f0af0975de8b5310c170445c75594092a1f4af56 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 28 Jul 2024 18:55:59 +0300 Subject: [PATCH] port to pika os 4 --- .github/release-canary-v3 | 2 +- debian/control | 2 +- main.sh | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 index 7ed6ff8..1e8b314 100644 --- a/.github/release-canary-v3 +++ b/.github/release-canary-v3 @@ -1 +1 @@ -5 +6 diff --git a/debian/control b/debian/control index b72b65a..bb8e282 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: ferreo Standards-Version: 4.6.1 -Build-Depends: debhelper-compat (= 13), cargo, imagemagick, build-essential, pkg-config, libclang-dev, libssl-dev, libasound2-dev, libjack-dev, libgtk-3-dev, libvulkan-dev, libunwind-dev, gcc, g++, yasm, nasm, curl, libx264-dev, libx265-dev, libxcb-render0-dev, libxcb-shape0-dev, libxcb-xfixes0-dev, libspeechd-dev, libxkbcommon-dev, libdrm-dev, libva-dev, libvulkan-dev, vulkan-headers, libva-dev, nvidia-cuda-toolkit, libffmpeg-nvenc-dev, libffmpeg-amf-dev +Build-Depends: debhelper-compat (= 13), cargo, imagemagick, build-essential, pkg-config, libclang-dev, libssl-dev, libasound2-dev, libjack-dev, libgtk-3-dev, libvulkan-dev, libunwind-dev, gcc, g++, yasm, nasm, curl, libx264-dev, libx265-dev, libxcb-render0-dev, libxcb-shape0-dev, libxcb-xfixes0-dev, libspeechd-dev, libxkbcommon-dev, libdrm-dev, libva-dev, libvulkan-dev, libva-dev, nvidia-cuda-toolkit, libffmpeg-nvenc-dev, amf-codec-headers Rules-Requires-Root: no Package: alvr diff --git a/main.sh b/main.sh index 71dfe48..d080ae6 100755 --- a/main.sh +++ b/main.sh @@ -42,32 +42,33 @@ mkdir -p ../alvr cp -rvf ../debian ../alvr/ # Make ALVR Dir -install -Dm644 LICENSE -t "../alvr/usr/share/licenses/$pkgname/" +install -Dm644 LICENSE -t "../alvr/usr/share/licenses/alvr/" install -Dm755 target/release/alvr_dashboard -t "../alvr/usr/bin/" # vrcompositor wrapper -install -Dm755 target/release/alvr_vrcompositor_wrapper "../alvr/usr/lib/alvr/vrcompositor-wrapper" -install -Dm644 target/release/alvr_drm_lease_shim.so "../alvr/usr/lib/alvr/alvr_drm_lease_shim.so" +install -Dm755 target/release/alvr_vrcompositor_wrapper "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/alvr/vrcompositor-wrapper" # OpenVR Driver -install -Dm644 target/release/libalvr_server.so "../alvr/usr/lib/steamvr/alvr/bin/linux64/driver_alvr_server.so" -install -Dm644 alvr/xtask/resources/driver.vrdrivermanifest -t "../alvr/usr/lib/steamvr/alvr/" +install -Dm644 target/release/libalvr_server.so "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/steamvr/alvr/bin/linux64/driver_alvr_server.so" +install -Dm644 alvr/xtask/resources/driver.vrdrivermanifest -t "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/steamvr/alvr/" # Vulkan Layer -install -Dm644 target/release/libalvr_vulkan_layer.so -t "../alvr/usr/lib/" +install -Dm644 target/release/libalvr_vulkan_layer.so -t "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/" install -Dm644 alvr/vulkan_layer/layer/alvr_x86_64.json -t "../alvr/usr/share/vulkan/explicit_layer.d/" # Desktop -install -Dm644 "alvr/xtask/resources/$pkgname.desktop" -t "../alvr/usr/share/applications" +install -Dm644 alvr/xtask/resources/alvr.desktop -t "../alvr/usr/share/applications" + # Icons install -d ../alvr/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps/ cp -ar icons/* ../alvr/usr/share/icons/ # Firewall -install -Dm644 alvr/xtask/firewall/ufw-alvr -t "../alvr/etc/ufw/applications.d/" +install -Dm644 "alvr/xtask/firewall/alvr-firewalld.xml" "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/firewalld/services/alvr.xml" +install -Dm644 "alvr/xtask/firewall/ufw-alvr" -t "../alvr/etc/ufw/applications.d/" -install -Dm755 alvr/xtask/firewall/alvr_fw_config.sh -t "../alvr/usr/share/alvr/" +install -Dm755 "alvr/xtask/firewall/alvr_fw_config.sh" -t "../alvr/usr/share/alvr/" cd ../alvr