forked from NatronGitHub/Natron
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RB-2.5 => RB-2.6 Merge fixes (NatronGitHub#989)
* 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. (NatronGitHub#972) * Fix windows pacman repo build. (NatronGitHub#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. (NatronGitHub#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. (NatronGitHub#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 (NatronGitHub#986) * RotoPaint: always draw the overlay when the tool is part of the overlay * tools/MacPorts: remove .rej files --------- Co-authored-by: Marcel Ruegenberg <gh2@picodesign.de> Co-authored-by: Frédéric Devernay <devernay@users.noreply.github.com> Co-authored-by: kafxa <148536772+kafxa@users.noreply.github.com> Co-authored-by: Aaron Colwell <300262+acolwell@users.noreply.github.com>
- Loading branch information
5 people
committed
Jul 23, 2024
1 parent
b38d9d5
commit eb364b6
Showing
35 changed files
with
1,032 additions
and
490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| Avoid using the C++11-specific nullptr. | ||
| https://github.com/ImageMagick/ImageMagick6/issues/319 | ||
| https://github.com/ImageMagick/ImageMagick6/commit/945a51944874548efee9de2370b164cf797ab012 | ||
| --- Magick++/lib/Color.cpp | ||
| +++ Magick++/lib/Color.cpp | ||
| @@ -223,7 +223,7 @@ const Magick::Color& Magick::Color::operator=(const std::string &x11color_) | ||
| _isValid = false; | ||
| _pixelOwn = false; | ||
| delete _pixel; | ||
| - _pixel = nullptr; | ||
| + _pixel = (PixelPacket *)NULL; | ||
| } | ||
| ThrowPPException(false); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 | ||
|
|
||
| PortSystem 1.0 | ||
|
|
||
| name giflib | ||
| version 4.2.3 | ||
| revision 1 | ||
| set major [lindex [split ${version} .] 0] | ||
| categories graphics | ||
| maintainers {ryandesign @ryandesign} openmaintainer | ||
| license MIT | ||
| homepage https://sourceforge.net/projects/giflib/ | ||
| master_sites sourceforge:project/giflib/giflib-${major}.x | ||
| use_bzip2 yes | ||
|
|
||
| description GIF library using patented LZW algorithm | ||
|
|
||
| long_description GIF loading and saving shared library. \ | ||
| Uses the LZW algorithm. | ||
|
|
||
| checksums rmd160 34c30ace20155a61446d1561af44e3ad6329b49a \ | ||
| sha256 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766 \ | ||
| size 560968 | ||
|
|
||
| patchfiles patch-gif_lib.h.diff \ | ||
| patch-lib-gif_hash.c.diff | ||
|
|
||
| configure.args --disable-x11 | ||
|
|
||
| use_parallel_build yes | ||
|
|
||
| set docdir ${prefix}/share/doc/${name} | ||
| post-destroot { | ||
| xinstall -d ${destroot}${docdir} | ||
| xinstall -W ${worksrcpath} -m 0644 AUTHORS BUGS COPYING NEWS README TODO api.txt history.txt ${destroot}${docdir} | ||
| xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1 | ||
| } | ||
|
|
||
| variant doc description {Install HTML documentation} { | ||
| depends_build-append port:xmlto | ||
| post-destroot { | ||
| xinstall -d ${destroot}${docdir}/html | ||
| xinstall -m 0644 {*}[glob ${worksrcpath}/doc/*.html] ${destroot}${docdir}/html | ||
| } | ||
| } | ||
|
|
||
| if {![variant_isset doc]} { | ||
| patchfiles-append patch-no-docs.diff | ||
| } | ||
|
|
||
| variant x11 description {Include gif2x11 tool for displaying GIF files in an X window} { | ||
| depends_lib-append port:xorg-libsm \ | ||
| port:xorg-libX11 | ||
|
|
||
| configure.args-delete --disable-x11 | ||
| } | ||
|
|
||
| livecheck.regex /${name}-(${major}\\.\[0-9.\]+)${extract.suffix} |
Oops, something went wrong.