port to pika os 4

.github/build-canary-v3

@@ -0,0 +1 @@
+2

.github/build-nest-v3

@@ -0,0 +1 @@
+1

.github/release-canary-v3

@@ -0,0 +1 @@
+10

.github/release-nest-v3

@@ -0,0 +1 @@
+1

.github/workflows/build-canaryv3.yml

@@ -0,0 +1,37 @@
+name: PikaOS Package Build Only (Canary) (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/build-canary-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Update APT Cache
+      run: apt-get update -y
+
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
+    - name: Build Package
+      run: ./main.sh

.github/workflows/build-nestv3.yml

@@ -0,0 +1,37 @@
+name: PikaOS Package Build Only (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/build-nest-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Update APT Cache
+      run: apt-get update -y
+
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
+    - name: Build Package
+      run: ./main.sh

.github/workflows/release-canaryv3.yml

@@ -0,0 +1,40 @@
+name: PikaOS Package Build & Release (Canary) (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/release-canary-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Update APT Cache
+      run: apt-get update -y
+
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
+    - name: Build Package
+      run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -0,0 +1,40 @@
+name: PikaOS Package Build & Release (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/release-nest-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Update APT Cache
+      run: apt-get update -y
+
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
+    - name: Build Package
+      run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

LICENSE.md

@@ -1,6 +1,6 @@
-MIT License
+MIT License (With DPKG packaging compatibility)
 
-Copyright (c) 2023 PikaOS
+Copyright (c) 2024 PikaOS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+Notes:
+The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

debian/changelog

@@ -1,3 +1,16 @@
+alvr (20.9.1-101pika1) pika; urgency=medium
+
+  * New release + PikaOS 4 port
+
+ -- ferreo <harderthanfire@gmail.com>  Wed, 18 Jan 2023 21:48:14 +0000
+
+alvr (20.4.2-100pika1) pikauwu; urgency=medium
+
+  * Initial release.
+
+ -- ferreo <harderthanfire@gmail.com>  Wed, 18 Jan 2023 21:48:14 +0000
+
+
 alvr (20.1.0-99pika1.lunar) lunar; urgency=medium
 
   * Initial release.

debian/control

@@ -3,7 +3,40 @@ Section: admin
 Priority: optional
 Maintainer: ferreo <harderthanfire@gmail.com>
 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, 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,
+	libpipewire-0.3-dev,
+	libspa-0.2-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

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

main.sh

@@ -2,15 +2,21 @@
 
 set -e
 
-DEBIAN_FRONTEND=noninteractive
+VERSION=20.9.1
 
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
+export PATH=$PATH:/root/.cargo/bin
 
 # Get build deps
 apt-get build-dep ./ -y
-
+apt-get install curl -y
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y
 
 # Build ALVR
-git clone https://github.com/alvr-org/ALVR --recursive -b v20.1.0
+git clone https://github.com/alvr-org/ALVR --recursive -b v"$VERSION"
 cd ./ALVR
 export CARGO_PROFILE_RELEASE_LTO=true
 export RUSTUP_TOOLCHAIN=stable
@@ -18,7 +24,7 @@ export CARGO_TARGET_DIR=target
 sed -i 's:../../../lib64/libalvr_vulkan_layer.so:libalvr_vulkan_layer.so:' alvr/vulkan_layer/layer/alvr_x86_64.json
 cargo fetch --locked --target "x86_64-unknown-linux-gnu"
 export ALVR_ROOT_DIR=/usr
-export ALVR_LIBRARIES_DIR="$ALVR_ROOT_DIR/lib/x86_64-linux-gnu"
+export ALVR_LIBRARIES_DIR="$ALVR_ROOT_DIR/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
 export ALVR_OPENVR_DRIVER_ROOT_DIR="$ALVR_LIBRARIES_DIR/steamvr/alvr/"
 export ALVR_VRCOMPOSITOR_WRAPPER_DIR="$ALVR_LIBRARIES_DIR/alvr/"
 export FIREWALL_SCRIPT_DIR="$ALVR_ROOT_DIR/share/alvr/"
@@ -42,32 +48,34 @@ 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/x86_64-linux-gnu/alvr/vrcompositor-wrapper"
+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/x86_64-linux-gnu/steamvr/alvr/bin/linux64/driver_alvr_server.so"
-install -Dm644 alvr/xtask/resources/driver.vrdrivermanifest -t "../alvr/usr/lib/x86_64-linux-gnu/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/x86_64-linux-gnu/"
+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 packaging/freedesktop/alvr.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 "packaging/firewall/alvr-firewalld.xml" "../alvr/usr/lib/x86_64-linux-gnu/firewalld/services/alvr.xml"
-install -Dm644 "packaging/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 packaging/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
 
 # Build package
+LOGNAME=root dh_make --createorig -y -l -p alvr_"$VERSION" || echo "dh-make: Ignoring Last Error"
 dpkg-buildpackage --no-sign
 
 # Move the debs to output

pika-build-config/amd64-v3.sh

@@ -0,0 +1,10 @@
+#! /bin/bash
+export PIKA_BUILD_ARCH="amd64-v3"
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_BUILD_OPTIONS="nocheck notest terse"
+export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/i386.sh

@@ -0,0 +1,5 @@
+#! /bin/bash
+export PIKA_BUILD_ARCH="i386"
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_OPTIONS="nocheck notest terse"
+export DPKG_GENSYMBOLS_CHECK_LEVEL=0

release.sh

@@ -1,8 +1,2 @@
 # send debs to server
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/
-
-# add debs to repo
-ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/'
-
-# publish the repo
-ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:'
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/