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

Fix windows pacman repo build. #968

Merged

Conversation

acolwell
Copy link
Collaborator

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

Msys2 updated gcc in the last few days which has caused the package repo build to fail. Here are some minor fixes to make the build work again.

  • Add fmt to openimageio's dependency list since the version included with the openimageio source now appears to cause an internal compiler error.

  • Added an include for math.h to in a libsox test file to make the compiler stop generating an error about fabs() not being defined.

  • Fix type mismatch and missing declaration errors in ImageMagick.

  • Updated mingw-w64-dump_syms gitcommit to point to a version that fixes a missing header build error.

Have you tested your changes (if applicable)? If so, how?

All of the build actions have successfully run with these changes and pass their tests (build repo action results, build installer action results, CI tests action results)

I also downloaded the installer that was built and did some ad-hoc testing with a few projects. Everything seems to work as it did before.

Futher details of this pull request

This is intentionally a minimal set of changes to get things building again on Windows. Several of these fixes are present in more recent upstream versions. I'll likely update a few of these dependencies in a follow-up when I have some time so we can take advantage of upstream fixes.

Msys2 updated gcc in the last few days which has caused the package
repo build to fail. Here are some minor fixes to make the build work
again.

- Add fmt to openimageio's dependency list since the version included
  with the openimageio source now appears to cause an internal compiler
  error.

- Added an include for math.h to in a libsox test file to make the
  compiler stop generating an error about fabs() not being defined.

- Fix type mismatch and missing declaration errors in ImageMagick.

- Updated mingw-w64-dump_syms gitcommit to point to a version that
  fixes a missing header build error.
@acolwell acolwell requested a review from rodlie May 18, 2024 03:02
@acolwell acolwell merged commit 8d456ac into NatronGitHub:RB-2.6 May 18, 2024
4 checks passed
@acolwell acolwell deleted the fix_windows_pacman_repo_build branch May 18, 2024 19:02
acolwell added a commit to acolwell/Natron that referenced this pull request Jul 2, 2024
Msys2 updated gcc in the last few days which has caused the package
repo build to fail. Here are some minor fixes to make the build work
again.

- Add fmt to openimageio's dependency list since the version included
  with the openimageio source now appears to cause an internal compiler
  error.

- Added an include for math.h to in a libsox test file to make the
  compiler stop generating an error about fabs() not being defined.

- Fix type mismatch and missing declaration errors in ImageMagick.

- Updated mingw-w64-dump_syms gitcommit to point to a version that
  fixes a missing header build error.
acolwell added a commit that referenced this pull request Jul 2, 2024
Msys2 updated gcc in the last few days which has caused the package
repo build to fail. Here are some minor fixes to make the build work
again.

- Add fmt to openimageio's dependency list since the version included
  with the openimageio source now appears to cause an internal compiler
  error.

- Added an include for math.h to in a libsox test file to make the
  compiler stop generating an error about fabs() not being defined.

- Fix type mismatch and missing declaration errors in ImageMagick.

- Updated mingw-w64-dump_syms gitcommit to point to a version that
  fixes a missing header build error.
devernay added a commit that referenced this pull request Jul 23, 2024
* Update README to reflect 2.5 release

* Remove Bountysource from Readme

Bountysource appears to be dead, so it should be removed

* macports update

* Update README.md

* update MacPorts

* Update compiler-common.sh

* Debug build fix

* CMake: Debug build type fix

* Comment out check for debug flag build type. (#972)

* Fix windows pacman repo build. (#968)

Msys2 updated gcc in the last few days which has caused the package
repo build to fail. Here are some minor fixes to make the build work
again.

- Add fmt to openimageio's dependency list since the version included
  with the openimageio source now appears to cause an internal compiler
  error.

- Added an include for math.h to in a libsox test file to make the
  compiler stop generating an error about fabs() not being defined.

- Fix type mismatch and missing declaration errors in ImageMagick.

- Updated mingw-w64-dump_syms gitcommit to point to a version that
  fixes a missing header build error.

* Fix Windows build failure caused by missing dependency. (#969)

Msys2's libcurl package was recently updated to enable HTTP/3
support which means it now also depends on libnghttp3.
genDllVersions.sh was updated to include this new dependency.

The Windows installer build action was also changed to upload its
build artifacts before it tests to make sure the plugins load. This
makes it possible to look at the generated artifacts for missing
dependencies if the plugin load verification fails.

* Fix Windows debug cmake build. (#973)

- Force Shiboken to use detected python libraries instead of
  using its own library detection logic.
- Specify -O compiler option for debug builds like the qmake build.
- Remove unconditional NDEBUG define added by the Shiboken cmake
  helper so that asserts work correctly on debug builds.

* Add logic to capture/restore existing GL context.

This fixes asserts in debug builds where Qt's GL context is set when
a ScopedGLContext is created. This can happen when we have a project
open and the user tries to open another project. When the event
callback is dispatched, the Qt GL context is still set. The fix
justs removes the assert and adds logic to save and restore any
existing GL context that is set.

* MacPorts update

* Fix rotopaint overlay 2.5 (#986)

* RotoPaint: always draw the overlay when the tool is part of the overlay

* tools/MacPorts: remove .rej files

---------

Co-authored-by: Marcel Ruegenberg <[email protected]>
Co-authored-by: Frédéric Devernay <[email protected]>
Co-authored-by: kafxa <[email protected]>
Co-authored-by: Aaron Colwell <[email protected]>
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