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

CI: Rewrite build script for OBS 28 based on obs-text-pthread #32

Merged
merged 16 commits into from
Jan 9, 2024

Conversation

norihiro
Copy link
Owner

@norihiro norihiro commented Jan 1, 2024

Description

This PR uses the same flow as norihiro/obs-text-pthread#43 to build macOS packages.
The build script for Windows is as same as #27 so that this PR will replace #27.

How Has This Been Tested?

General checklist

  • The commit is reviewed by yourself.
  • The code is tested.
  • Document is up to date or not necessary to be changed.
  • The commit is compatible with repository's license.

@norihiro norihiro force-pushed the obs-28-brew branch 5 times, most recently from 323291e to 8df5c78 Compare January 1, 2024 15:52
@norihiro norihiro marked this pull request as ready for review January 1, 2024 15:57
@norihiro norihiro force-pushed the obs-28-brew branch 2 times, most recently from b744cf0 to 501d831 Compare January 2, 2024 13:58
This commit also starts to use zlib from obs-deps on Windows.
Also changes
- Update libpng from 1.6.28 to 1.6.40
- Do not build examples
  This feature is not implemented in the released libvncserver but will
  be included in future release.
According to an issue packagesdev/packages#144, the file was
intentionally replaced by the owner. Let's use the new one.
@norihiro
Copy link
Owner Author

norihiro commented Jan 4, 2024

Tested on mac (arm64 and x86_64 on Rosetta).

@norihiro norihiro force-pushed the obs-28-brew branch 6 times, most recently from 251b2ed to 40dec8a Compare January 9, 2024 06:55
@norihiro
Copy link
Owner Author

norihiro commented Jan 9, 2024

Linking libraries on Windows looks ok according to grep but I will test it later.

$ strings obs-plugins/64bit/obs-vnc.dll | grep '\.dll$'
%s.dll
obs-vnc.dll
obs.dll
WSOCK32.dll
WS2_32.dll
w32-pthreads.dll
CRYPT32.dll
KERNEL32.dll
USER32.dll
ADVAPI32.dll
VCRUNTIME140.dll
api-ms-win-crt-string-l1-1-0.dll
api-ms-win-crt-stdio-l1-1-0.dll
api-ms-win-crt-heap-l1-1-0.dll
api-ms-win-crt-utility-l1-1-0.dll
api-ms-win-crt-time-l1-1-0.dll
api-ms-win-crt-runtime-l1-1-0.dll
api-ms-win-crt-convert-l1-1-0.dll
api-ms-win-crt-environment-l1-1-0.dll
api-ms-win-crt-filesystem-l1-1-0.dll
zlib.dll

The openssl library is required by libvncclient. The dependencies should
be controlled from libvncclient but it makes errors at link phase.
@norihiro
Copy link
Owner Author

norihiro commented Jan 9, 2024

The DLL for Windows works ok now. The failure on macOS is caused by the updated agreement so that it's not related to this PR.

@norihiro norihiro merged commit ed70ec8 into main Jan 9, 2024
7 of 9 checks passed
@norihiro norihiro added this to the 0.5.0 milestone Jan 9, 2024
@norihiro norihiro deleted the obs-28-brew branch January 10, 2024 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant