-
Notifications
You must be signed in to change notification settings - Fork 328
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #358 from NatronGitHub/RB-2.3-sdk-upgrade
Rb 2.3 sdk upgrade
- Loading branch information
Showing
116 changed files
with
2,124 additions
and
682 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| This directory contains tools to build docker images (requires docker). | ||
|
|
||
| The `natron-sdk` docker image is available from dockerhub, see https://hub.docker.com/r/natrongithub/natron-sdk | ||
|
|
||
| - `natron-sdk/build.sh` builds the natron-sdk docker image | ||
| - `natron-sdk/push.sh` pushes the natron-sdk docker image to dockerhub |
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 @@ | ||
| docker push natrongithub/natron-sdk:latest |
12 changes: 12 additions & 0 deletions
12
tools/jenkins/include/patches/OpenImageIO/2.0/oiio-2.0.8-invalidatespec.patch
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,12 @@ | ||
| --- oiio-Release-2.0.8/src/libtexture/imagecache_pvt.h.orig 2019-05-03 17:56:26.000000000 -0700 | ||
| +++ oiio-Release-2.0.8/src/libtexture/imagecache_pvt.h 2019-05-23 20:53:57.000000000 -0700 | ||
| @@ -337,7 +337,8 @@ | ||
| void invalidate_spec() | ||
| { | ||
| m_validspec = false; | ||
| - m_subimages.clear(); | ||
| + //Do not clear the subimages here because another thread might be using it | ||
| + //m_subimages.clear (); | ||
| } | ||
|
|
||
| /// Should we print an error message? Keeps track of whether the |
63 changes: 63 additions & 0 deletions
63
tools/jenkins/include/patches/Qt/patch-allow_libressl.diff
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,63 @@ | ||
| --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig | ||
| +++ src/network/ssl/qsslsocket_openssl_symbols.cpp | ||
| @@ -228,13 +228,17 @@ | ||
| #ifndef OPENSSL_NO_SSL2 | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| #endif | ||
| +#ifndef OPENSSL_NO_SSL3 | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| +#endif | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| #ifndef OPENSSL_NO_SSL2 | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| #endif | ||
| +#ifndef OPENSSL_NO_SSL3 | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| +#endif | ||
| DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) | ||
| #else | ||
| @@ -822,13 +826,17 @@ | ||
| #ifndef OPENSSL_NO_SSL2 | ||
| RESOLVEFUNC(SSLv2_client_method) | ||
| #endif | ||
| +#ifndef OPENSSL_NO_SSL3 | ||
| RESOLVEFUNC(SSLv3_client_method) | ||
| +#endif | ||
| RESOLVEFUNC(SSLv23_client_method) | ||
| RESOLVEFUNC(TLSv1_client_method) | ||
| #ifndef OPENSSL_NO_SSL2 | ||
| RESOLVEFUNC(SSLv2_server_method) | ||
| #endif | ||
| +#ifndef OPENSSL_NO_SSL3 | ||
| RESOLVEFUNC(SSLv3_server_method) | ||
| +#endif | ||
| RESOLVEFUNC(SSLv23_server_method) | ||
| RESOLVEFUNC(TLSv1_server_method) | ||
| RESOLVEFUNC(X509_NAME_entry_count) | ||
| --- src/network/ssl/qsslsocket_openssl.cpp.orig | ||
| +++ src/network/ssl/qsslsocket_openssl.cpp | ||
| @@ -267,15 +267,19 @@ | ||
| #endif | ||
| break; | ||
| case QSsl::SslV3: | ||
| +#ifndef OPENSSL_NO_SSL3 | ||
| ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); | ||
| +#else | ||
| + ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error | ||
| +#endif | ||
| break; | ||
| - case QSsl::SecureProtocols: // SslV2 will be disabled below | ||
| - case QSsl::TlsV1SslV3: // SslV2 will be disabled below | ||
| case QSsl::AnyProtocol: | ||
| - default: | ||
| ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); | ||
| break; | ||
| case QSsl::TlsV1: | ||
| + case QSsl::SecureProtocols: | ||
| + case QSsl::TlsV1SslV3: | ||
| + default: | ||
| ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); | ||
| break; | ||
| } |
29 changes: 29 additions & 0 deletions
29
tools/jenkins/include/patches/Qt/patch-parallelize_qmake_build.diff
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,29 @@ | ||
| --- configurel.orig | ||
| +++ configure | ||
| @@ -1087,6 +1087,7 @@ | ||
| #------------------------------------------------------------------------------- | ||
| # parse command line arguments | ||
| #------------------------------------------------------------------------------- | ||
| +JOBS= | ||
|
|
||
| # parse the arguments, setting things to "yes" or "no" | ||
| while [ "$#" -gt 0 ]; do | ||
| @@ -2538,6 +2539,9 @@ | ||
| UNKNOWN_OPT=yes | ||
| fi | ||
| ;; | ||
| + jobs) | ||
| + JOBS=-j$VAL | ||
| + ;; | ||
| *) | ||
| UNKNOWN_OPT=yes | ||
| ;; | ||
| @@ -5137,7 +5141,7 @@ | ||
| done | ||
|
|
||
| QMAKE_BUILD_ERROR=no | ||
| - (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes | ||
| + (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes | ||
| [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake | ||
| [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h | ||
| [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 |
11 changes: 11 additions & 0 deletions
11
tools/jenkins/include/patches/Qt/patch-qmake_generators_unix_unixmake.cpp.diff
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,11 @@ | ||
| --- qmake/generators/unix/unixmake.cpp.orig | ||
| +++ qmake/generators/unix/unixmake.cpp | ||
| @@ -951,7 +951,7 @@ | ||
| else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP")) | ||
| ret += " " + var("QMAKE_STRIPFLAGS_APP"); | ||
| if(bundle) | ||
| - ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; | ||
| + ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; | ||
| else | ||
| ret += " \"" + dst_targ + "\""; | ||
| } |
11 changes: 11 additions & 0 deletions
11
tools/jenkins/include/patches/Qt/patch-src_corelib_io_qsettings.cpp.diff
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,11 @@ | ||
| --- src/corelib/io/qsettings.cpp.orig | ||
| +++ src/corelib/io/qsettings.cpp | ||
| @@ -122,7 +122,7 @@ | ||
| Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc) | ||
| Q_GLOBAL_STATIC(PathHash, pathHashFunc) | ||
| Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc) | ||
| -Q_GLOBAL_STATIC(QMutex, globalMutex) | ||
| +Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive)) | ||
| static QSettings::Format globalDefaultFormat = QSettings::NativeFormat; | ||
|
|
||
| #ifndef Q_OS_WIN |
11 changes: 11 additions & 0 deletions
11
tools/jenkins/include/patches/Qt/patch-src_gui_text_qfontengine_coretext.mm.diff
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,11 @@ | ||
| --- src/gui/text/qfontengine_coretext.mm.orig | ||
| +++ src/gui/text/qfontengine_coretext.mm | ||
| @@ -886,7 +886,7 @@ | ||
|
|
||
| QFixed QCoreTextFontEngine::emSquareSize() const | ||
| { | ||
| - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); | ||
| + return QFixed(int(CTFontGetUnitsPerEm(ctfont))); | ||
| } | ||
|
|
||
| QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const |
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
12 changes: 12 additions & 0 deletions
12
.../jenkins/include/patches/Qt/qt-everywhere-opensource-src-4.8.7-crash-in-qppmhandler.patch
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,12 @@ | ||
| diff -up qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp | ||
| --- qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me 2019-03-22 10:22:16.213800109 +0100 | ||
| +++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp 2019-03-22 10:22:40.721890281 +0100 | ||
| @@ -108,7 +108,7 @@ static bool read_pbm_header(QIODevice *d | ||
| else | ||
| mcc = read_pbm_int(device); // get max color component | ||
|
|
||
| - if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0) | ||
| + if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0 || mcc > 0xffff) | ||
| return false; // weird P.M image | ||
|
|
||
| return true; |
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
13 changes: 13 additions & 0 deletions
13
tools/jenkins/include/patches/Qt/qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch
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,13 @@ | ||
| diff -up qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 qt-everywhere-opensource-src-4.8.7/src/script/script.pro | ||
| --- qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 2015-05-07 09:14:43.000000000 -0500 | ||
| +++ qt-everywhere-opensource-src-4.8.7/src/script/script.pro 2018-05-19 16:01:24.699926959 -0500 | ||
| @@ -91,6 +91,9 @@ symbian { | ||
| TARGET.UID3=0x2001B2E1 | ||
| } | ||
|
|
||
| +# hack around gcc8 optimization bug with -O2 | ||
| +QMAKE_CXXFLAGS_RELEASE += -O1 | ||
| + | ||
| symbian { | ||
| symbian-abld|symbian-sbsv2 { | ||
| MMP_RULES += ALWAYS_BUILD_AS_ARM |
Oops, something went wrong.