Linux support, from SlimeVR-OpenVR-Driver #7

funnbot · 2023-01-28T03:20:26Z

No description provided.

kitlith

I don't have the energy to properly review the unix socket code, but that should be okay since it's shared with the driver (and should thus already work and has been tested, barring the issue that butterscotch raised yesterday, which I just fixed)

I'll see if I can clean up the CI stuff myself before merging, so I don't think you'll need to do anything more.

rust_part/CMakeLists.txt

.github/workflows/build.yml

kitlith · 2023-01-28T21:44:10Z

Shit, CI is failing on linux because of the version embedding code.

Error: /home/runner/work/SlimeVR-Feeder-App/SlimeVR-Feeder-App/src/main.cpp:21:10: fatal error: version.h: No such file or directory

i don't know why. this is kinda important though because I want all the releases to come from CI.

EDIT: I can reproduce on WSL, so it's not limited to CI.

funnbot · 2023-01-28T22:28:01Z

-- version in git: doesn't actually print the version, so a tag isnt checked out in that case or something?
Happens on windows and ubuntu builds.

kitlith · 2023-01-28T22:32:50Z

-- version in git: doesn't actually print the version, so a tag isnt checked out in that case or something? Happens on windows and ubuntu builds.

that should still result in version.h being generated, just with a blank version. but in my local reproduction (where it is parsing the version correctly, even), version.h just... isn't generated at all. no error or anything, it just isn't there.

kitlith · 2023-01-28T22:45:16Z

-- version in git: is output from the custom command, so it's getting run, but configure_file isn't actually producing anything i guess?

re: your latest commit: i'm ahead of you there, the directories seem to be set correctly

funnbot · 2023-01-28T23:12:19Z

Windows side prints this warning...

C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets(247,5): warning MSB8065: Custom build for item "D:\a\SlimeVR-Feeder-App\SlimeVR-Feeder-App\build\CMakeFiles\e9797dbf0013314fb2d386b44164446b\version.h.rule" succeeded, but specified output "d:\a\slimevr-feeder-app\slimevr-feeder-app\build\always_run" has not been created. This may cause incremental build to work incorrectly. [D:\a\SlimeVR-Feeder-App\SlimeVR-Feeder-App\build\SlimeVR-Feeder-App.vcxproj]

OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/version.h" always_run
Ah, so the file is never generated, which ensures it always tries to generate the version.h?

kitlith · 2023-01-29T00:24:39Z

That's the idea, yeah. Was done that way to ensure that locally, a new commit always causes the version to include it on build.

There may be a better way to handle that part of the cmake setup (i.e. it doesn't seem to work on ubuntu, which I know because i tried doing touch build/version.h; chmod 000 build/version.h to at least see if i could get configure_file to error and instead it just skipped it)

kitlith · 2023-01-29T00:39:12Z

okay, if I manually run the custom command, version.h does appear. so why doesn't it appear during the build...?

i grabbed inotifywait and this is what it says happens:

build/ CREATE version.h.tmp
build/ OPEN version.h.tmp
build/ MODIFY version.h.tmp
build/ CLOSE_WRITE,CLOSE version.h.tmp
build/ OPEN version.h.tmp
build/ CREATE version.h
build/ OPEN version.h
build/ CLOSE_NOWRITE,CLOSE version.h.tmp
build/ CLOSE_WRITE,CLOSE version.h
build/ OPEN version.h.tmp
build/ DELETE version.h
build/ CREATE version.h
build/ OPEN version.h
build/ ACCESS version.h.tmp
build/ MODIFY version.h
build/ CLOSE_NOWRITE,CLOSE version.h.tmp
build/ CLOSE_WRITE,CLOSE version.h
build/ ATTRIB version.h
build/ DELETE version.h.tmp
build/ DELETE version.h

so it appearently does get created (at some point), it just gets deleted again afterwards i guess? perhaps it's time to re-do how cmake handles the versioning bit.

funnbot · 2023-01-29T00:43:01Z

Oh because the makefile generator deletes OUTPUT, I think thats just for clean though...

kitlith · 2023-01-29T01:18:32Z

yeah okay good that fixed that part of CI, but there's a bit of an error in the C++ that only shows up on linux: error: cannot bind non-const lvalue reference of type ‘simdjson::fallback::ondemand::object&’ to an rvalue of type ‘simdjson::fallback::ondemand::object’

kitlith · 2023-01-29T01:33:24Z

@funnbot okay. can you please test this now that it compiles? keep in mind that the fix for #6 isn't in this branch, but if you rebase off of the main branch you should be good.

ImUrX · 2023-02-05T23:50:41Z

should have pinged me, I need to add the socket in the server lol

kitlith · 2023-02-06T00:38:09Z

@ImUrX ah.

This also has one more thing that needs to be done that I apparently forgot to make a comment on the PR about.

We need to set RPATH so that we actually use the copy of openvr that we bundle with the feeder. In the meantime, setting LD_LIBRARY_PATH at runtime should work as a workaround for testing.

Heh, it probably also needs an update to use XDG_RUNTIME_DIR as well instead of hardcoding /tmp

ImUrX · 2023-02-06T00:41:58Z

yeah, i mentioned funnbot about that, I can commit it myself tbh

kitlith · 2023-02-13T02:42:43Z

Okay, that should actually be everything, for real this time. Just needs testing (have some artifacts: https://github.com/funnbot/SlimeVR-Feeder-App/suites/10935047338/artifacts/553084572) and then I'll merge it in.

Artifacts for the two platforms are getting merged in CI, I should probably fix that at some point, but it's okay for now, so I'm gonna punt on that. Not a blocker for this PR.

kitlith · 2023-02-14T04:25:33Z

facepalm i've been saying this is finally ready to test, except it isn't, because it still doesn't include the driver rename fix. I'll just do that rebase now.

not auto created on linux, causing build to fail

hopefully this fixes linux build, and still works on windows.

This is (hopefully) the last of the issues caused by my code.

Still need to set RPATH to make things nice.

Modeled after SlimeVR/SlimeVR-OpenVR-Driver#35 Co-authored-by: Uriel <[email protected]>

This may need to be adjusted for distro packaging. >_>

ImUrX · 2023-02-15T20:51:01Z

Tested it and it works!

ImUrX

would be nice to also make the action run on PR

ImUrX · 2023-02-15T20:51:38Z

.github/workflows/build.yml

@@ -43,10 +43,12 @@ jobs:
      - name: CMake+vcpkg configure
        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo
        shell: cmd
+        if: runner.os == 'Windows'


change everything to use runner.os or use matrix.os

punting to #10

kitlith approved these changes Jan 28, 2023

View reviewed changes

rust_part/CMakeLists.txt Show resolved Hide resolved

.github/workflows/build.yml Show resolved Hide resolved

ImUrX approved these changes Feb 13, 2023

View reviewed changes

funnbot and others added 13 commits February 13, 2023 20:26

copy unix_sockets.hpp from SlimeVR-OpenVR-Driver

aa01f5f

added UnixSocketBridge, copied from driver.

bdf5535

add ubuntu-latest to matrix build

539b2ae

add Linux build commands not using cmd.exe

3f73c1d

fix: rust_part cmake error on unix

6e1d4d0

fix: create protobuf output directory

2b430f4

not auto created on linux, causing build to fail

log the configure file paths

893ad71

switch from add_custom_command to add_custom_target.

74b0720

hopefully this fixes linux build, and still works on windows.

lvalue ref -> rvalue ref

1e0a35c

This is (hopefully) the last of the issues caused by my code.

Fix remaining compilation errors.

4bdec5f

linux: copy libopenvr_api.so when packaging

a9b8cba

Still need to set RPATH to make things nice.

Use XDG_RUNTIME_DIR

0fee9b7

Modeled after SlimeVR/SlimeVR-OpenVR-Driver#35 Co-authored-by: Uriel <[email protected]>

Set RPATH on Linux, to avoid needing to futz w/ LD_LIBRARY_PATH.

14cea43

This may need to be adjusted for distro packaging. >_>

kitlith force-pushed the pr/linux-support branch from b0d08cf to 14cea43 Compare February 14, 2023 04:26

ImUrX requested changes Feb 15, 2023

View reviewed changes

kitlith mentioned this pull request Feb 22, 2023

Change everything to use runner.os or use matrix.os #10

Open

kitlith merged commit 7379ba7 into SlimeVR:master Feb 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Linux support, from SlimeVR-OpenVR-Driver #7

Linux support, from SlimeVR-OpenVR-Driver #7

funnbot commented Jan 28, 2023

kitlith left a comment

kitlith commented Jan 28, 2023 •

edited

Loading

funnbot commented Jan 28, 2023 •

edited

Loading

kitlith commented Jan 28, 2023

kitlith commented Jan 28, 2023 •

edited

Loading

funnbot commented Jan 28, 2023 •

edited

Loading

kitlith commented Jan 29, 2023 •

edited

Loading

kitlith commented Jan 29, 2023 •

edited

Loading

funnbot commented Jan 29, 2023 •

edited

Loading

kitlith commented Jan 29, 2023

kitlith commented Jan 29, 2023

ImUrX commented Feb 5, 2023

kitlith commented Feb 6, 2023 •

edited

Loading

ImUrX commented Feb 6, 2023

kitlith commented Feb 13, 2023 •

edited

Loading

kitlith commented Feb 14, 2023

ImUrX commented Feb 15, 2023

ImUrX left a comment

ImUrX Feb 15, 2023

kitlith Feb 22, 2023

Linux support, from SlimeVR-OpenVR-Driver #7

Linux support, from SlimeVR-OpenVR-Driver #7

Conversation

funnbot commented Jan 28, 2023

kitlith left a comment

Choose a reason for hiding this comment

kitlith commented Jan 28, 2023 • edited Loading

funnbot commented Jan 28, 2023 • edited Loading

kitlith commented Jan 28, 2023

kitlith commented Jan 28, 2023 • edited Loading

funnbot commented Jan 28, 2023 • edited Loading

kitlith commented Jan 29, 2023 • edited Loading

kitlith commented Jan 29, 2023 • edited Loading

funnbot commented Jan 29, 2023 • edited Loading

kitlith commented Jan 29, 2023

kitlith commented Jan 29, 2023

ImUrX commented Feb 5, 2023

kitlith commented Feb 6, 2023 • edited Loading

ImUrX commented Feb 6, 2023

kitlith commented Feb 13, 2023 • edited Loading

kitlith commented Feb 14, 2023

ImUrX commented Feb 15, 2023

ImUrX left a comment

Choose a reason for hiding this comment

ImUrX Feb 15, 2023

Choose a reason for hiding this comment

kitlith Feb 22, 2023

Choose a reason for hiding this comment

kitlith commented Jan 28, 2023 •

edited

Loading

funnbot commented Jan 28, 2023 •

edited

Loading

kitlith commented Jan 28, 2023 •

edited

Loading

funnbot commented Jan 28, 2023 •

edited

Loading

kitlith commented Jan 29, 2023 •

edited

Loading

kitlith commented Jan 29, 2023 •

edited

Loading

funnbot commented Jan 29, 2023 •

edited

Loading

kitlith commented Feb 6, 2023 •

edited

Loading

kitlith commented Feb 13, 2023 •

edited

Loading