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.

Sign up for GitHub

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

Deps update 10 2024 #121

Merged
merged 4 commits into from
Oct 15, 2024
Merged

Deps update 10 2024 #121

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dea6aa
Dependencies update 10-2024:
mdabek-nvidia Oct 3, 2024
55bb36b
OpenSSL patch for building on perl < 5.19.3
mdabek-nvidia Oct 8, 2024
e689a8a
Reverting FFmpeg to 7.0.2 version due to test issues in DALI
mdabek-nvidia Oct 11, 2024
bf81586
Reverting FFmpeg to 7.0.2 version due to test issues in DALI
mdabek-nvidia Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,36 @@ The repository consists mostly of externally hosted subrepositories:
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `flac <https://github.com/xiph/flac>`_ | `1.4.3 with cross-compilation patch <https://github.com/xiph/flac/releases/tag/1.4.3>`_ | `BSD-3 license (+ GPL for utils, not used by DALI) <https://github.com/xiph/flac/blob/master/COPYING.Xiph>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `opus <https://github.com/xiph/opus>`_ | `1.4 <https://github.com/xiph/opus/releases/tag/v1.4>`_ | `BSD-3 license <https://github.com/xiph/opus/blob/master/COPYING>`_ |
| `opus <https://github.com/xiph/opus>`_ | `1.5.2 <https://github.com/xiph/opus/releases/tag/v1.5.2>`_ | `BSD-3 license <https://github.com/xiph/opus/blob/master/COPYING>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `FFmpeg <https://github.com/FFmpeg/FFmpeg>`_ | `7.0.2 <https://github.com/FFmpeg/FFmpeg/releases/tag/n7.0.2>`_ | `LGPL v2.1 license <https://github.com/FFmpeg/FFmpeg/blob/master/LICENSE.md>`_ |
| `FFmpeg <https://github.com/FFmpeg/FFmpeg>`_ | `7.1 <https://github.com/FFmpeg/FFmpeg/releases/tag/n7.1>`_ | `LGPL v2.1 license <https://github.com/FFmpeg/FFmpeg/blob/master/LICENSE.md>`_ |
stiepan marked this conversation as resolved.
Show resolved Hide resolved
| | `(Source Snapshot) <https://developer.download.nvidia.com/compute/redist/nvidia-dali/FFmpeg-n7.0.2.tar.gz>`_ | |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `OpenCV <https://github.com/opencv/opencv/>`_ | `4.10.0 <https://github.com/opencv/opencv/releases/tag/4.10.0>`_ | `Apache License 2.0 <https://github.com/opencv/opencv/blob/master/LICENSE>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `openjpeg <https://github.com/uclouvain/openjpeg>`_ | `2.5.2 <https://github.com/uclouvain/openjpeg/releases/tag/v2.5.2>`_ | `BSD-2 license <https://github.com/uclouvain/openjpeg/blob/master/LICENSE>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `libtiff <https://gitlab.com/libtiff/libtiff>`_ | `4.6.0 (+ Build System Patch) <https://gitlab.com/libtiff/libtiff/-/tree/v4.6.0>`_ | `BSD-2 license <https://gitlab.com/libtiff/libtiff/-/blob/master/README.md>`_ |
| `libtiff <https://gitlab.com/libtiff/libtiff>`_ | `4.7.0 (+ Build System Patch) <https://gitlab.com/libtiff/libtiff/-/tree/v4.7.0>`_ | `BSD-2 license <https://gitlab.com/libtiff/libtiff/-/blob/master/README.md>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `zstd <https://github.com/facebook/zstd>`_ | `1.5.6 <https://github.com/facebook/zstd/releases/tag/v1.5.6>`_ | `BSD-3 license <https://github.com/facebook/zstd/blob/dev/LICENSE>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `libjpeg-turbo <https://github.com/libjpeg-turbo/libjpeg-turbo/>`_ | `3.0.3 <https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.3>`_ | `BSD-3 license, IJG license, zlib license <https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md>`_ |
| `libjpeg-turbo <https://github.com/libjpeg-turbo/libjpeg-turbo/>`_ | `3.0.90 <https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.90>`_ | `BSD-3 license, IJG license, zlib license <https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `liblmdb <https://github.com/LMDB/lmdb/blob/mdb.master/libraries/liblmdb/>`_ | `0.9.31 <https://github.com/LMDB/lmdb/releases/tag/LMDB_0.9.31>`_ | `OpenLDAP Public License <https://github.com/LMDB/lmdb/blob/mdb.master/libraries/liblmdb/LICENSE>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `protobuf <https://github.com/protocolbuffers/protobuf/>`_ | `27.2 <https://github.com/protocolbuffers/protobuf/releases/tag/v27.2>`_ | `BSD-3 license <https://github.com/protocolbuffers/protobuf/blob/master/LICENSE>`_ |
| `protobuf <https://github.com/protocolbuffers/protobuf/>`_ | `28.2 <https://github.com/protocolbuffers/protobuf/releases/tag/v28.2>`_ | `BSD-3 license <https://github.com/protocolbuffers/protobuf/blob/master/LICENSE>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `zlib <https://github.com/madler/zlib>`_ | `1.3.1 <https://github.com/madler/zlib/releases/tag/v1.3.1>`_ | `zlib License <https://github.com/madler/zlib/blob/master/README>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `libtar <https://github.com/tklauser/libtar.git>`_ | `1.2.20 + patches (master) <https://github.com/tklauser/libtar/commit/6379b5d2ae777dad576aeae70566740670057821>`_ | `BSD-3 license <https://github.com/tklauser/libtar/blob/master/COPYRIGHT>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `cfitsio <https://github.com/healpy/cfitsio.git>`_ | `4.1.0 <https://github.com/healpy/cfitsio/commit/316e95008492b597b3cbcf84168df22996fe2b6f>`_ | `MIT-like license (NASA) <https://github.com/healpy/cfitsio/blob/master/License.txt>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `curl <https://github.com/curl/curl.git>`_ | `8.9.1 <https://github.com/curl/curl/releases/tag/curl-8_9_1>`_ | `CURL license <https://github.com/curl/curl/blob/master/LICENSES/curl.txt>`_ |
| `curl <https://github.com/curl/curl.git>`_ | `8.10.1 <https://github.com/curl/curl/releases/tag/curl-8_10_1>`_ | `CURL license <https://github.com/curl/curl/blob/master/LICENSES/curl.txt>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `OpenSSL <https://github.com/openssl/openssl.git>`_ | `3.3.1 <https://github.com/openssl/openssl/tree/openssl-3.3.1>`_ | `Apache 2.0 license <https://github.com/openssl/openssl/blob/master/LICENSE.txt>`_ |
| `OpenSSL <https://github.com/openssl/openssl.git>`_ | `3.3.2 <https://github.com/openssl/openssl/tree/openssl-3.3.2>`_ | `Apache 2.0 license <https://github.com/openssl/openssl/blob/master/LICENSE.txt>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+
| `aws_sdk_cpp <https://github.com/aws/aws-sdk-cpp.git>`_ | `1.11.351 <https://github.com/aws/aws-sdk-cpp/tree/1.11.351>`_ | `Apache 2.0 license <https://github.com/aws/aws-sdk-cpp/blob/main/LICENSE.txt>`_ |
| `aws_sdk_cpp <https://github.com/aws/aws-sdk-cpp.git>`_ | `1.11.418 <https://github.com/aws/aws-sdk-cpp/tree/1.11.418>`_ | `Apache 2.0 license <https://github.com/aws/aws-sdk-cpp/blob/main/LICENSE.txt>`_ |
+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------+

Installing dependencies locally
Expand Down
3 changes: 1 addition & 2 deletions build_scripts/build_aws-sdk-cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ echo "set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")" >> ${TOOLCHAIN_FILE}

# Build and install static OpenSSL libs to a temporary dir
pushd ${ROOT_DIR}/third_party/openssl
patch -p1 < ${ROOT_DIR}/patches/openssl/openssl-CVE-2024-5535.patch

patch -p1 < ${ROOT_DIR}/patches/openssl/openssl-PR25467.patch
CFLAGS="$CFLAGS -fPIC -Wa,--noexecstack"
declare -a OPTS
OPTS+=(no-shared)
Expand Down
4 changes: 0 additions & 4 deletions build_scripts/build_libtiff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
# libtiff
pushd third_party/libtiff
patch -p1 < ${ROOT_DIR}/patches/0001-Fix-wget-complaing-about-expired-git.savannah.gnu.or.patch
patch -p1 < ${ROOT_DIR}/patches/libtiff-CVE-2023-6228.patch
patch -p1 < ${ROOT_DIR}/patches/libtiff-CVE-2023-6277.patch
patch -p1 < ${ROOT_DIR}/patches/libtiff-CVE-2023-52356.patch
patch -p1 < ${ROOT_DIR}/patches/libtiff-CVE-2024-7006.patch

mkdir -p build
cd build
Expand Down
46 changes: 0 additions & 46 deletions patches/libtiff-CVE-2023-52356.patch
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions patches/libtiff-CVE-2023-6228.patch
View file
Open in desktop

This file was deleted.

Loading