Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PlayerOne cameras: update to SDK version V3.7.1 #1278

Merged
merged 2 commits into from
Jan 4, 2025

Conversation

agalasso
Copy link
Contributor

@agalasso agalasso commented Jan 2, 2025

  • Merge prior work on PlayerOne cameras with Ethan's
  • format source files with clang-format
  • tested with vendor's camera on Mac and Windows

@agalasso agalasso requested a review from bwdev01 January 2, 2025 00:54
@agalasso
Copy link
Contributor Author

agalasso commented Jan 2, 2025

@EthanChappel FYI this PR is the result of merging my earlier work on Player One cameras with your recent PR. Most of the changes are just renaming some things (like poa => playerone), adding the script to unpack the SDK libs (unpack_playerone_sdk), formatting with clang-format, and fixes for MacOS (install_name_tool stuff in CMakeLists.txt).

@EthanChappel
Copy link
Contributor

EthanChappel commented Jan 3, 2025

I think something here and in my fork #1280 has broken the program on Linux. Freezes until force closed when trying to open the camera switcher while Player One Camera is selected and one is attached to the PC. Does not freeze with no camera attached. Master branch with the initial work still acts as expected. Built and tested each branch on x64 Linux multiple times to verify.

All branches seem to skip installing the Player One shared object when running make install on Linux, so will need to address that later after some sleep.

@agalasso
Copy link
Contributor Author

agalasso commented Jan 3, 2025

All branches seem to skip installing the Player One shared object when running make install on Linux.

I found one issue: cmake installs libPlayerOneCamera.so which is a broken symlink to libPlayerOneCamera.so.3.7.1, and phd2.bin actually wants to load libPlayerOneCamera.so.3 which does not exist. I will fix this in this branch shortly ...

@agalasso
Copy link
Contributor Author

agalasso commented Jan 4, 2025

@bwdev01 please let me know if you would like more time to review this. If so I'll hold off on merging, otherwise I'll just merge it some time today.

@EthanChappel
Copy link
Contributor

EthanChappel commented Jan 4, 2025

phd2.sh was renamed to phd2.sh.in and it seems to have broken make install. Renaming it manually fixed it and lets the installed PHD2 launch as expected.

-- Installing: /usr/bin/phd2.bin
-- Set runtime path of "/usr/bin/phd2.bin" to ""
CMake Error at cmake_install.cmake:352 (file):
  file INSTALL cannot find "/home/ethan/Documents/phd2/phd2.sh": No such file
  or directory.


make: *** [Makefile:130: install] Error 1

 * Merge prior work on PlayerOne cameras with Ethan's
 * format source files with clang-format
 * tested on Mac and Windows
@agalasso agalasso force-pushed the andy/playerone-camera-support-added branch from 50d3dda to 3686443 Compare January 4, 2025 22:10
@agalasso
Copy link
Contributor Author

agalasso commented Jan 4, 2025

phd2.sh was renamed

@EthanChappel this branch was out of date with master. I just rebased the branch to fix it. I'm going to merge this to master now so we can un-block the dependent prs.

@agalasso agalasso merged commit 6851f05 into master Jan 4, 2025
4 checks passed
@agalasso agalasso deleted the andy/playerone-camera-support-added branch January 4, 2025 22:13
@agalasso agalasso restored the andy/playerone-camera-support-added branch January 4, 2025 23:52
@EthanChappel
Copy link
Contributor

Still having freezing/crashing on Linux (tested on arm64 and x64) when clicking the camera switcher button starting with 8a85159. Trying some things in thirdparty.cmake and unpack_playerone_sdk but no results yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants