Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cmake/defaults/CYCOMMON.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ SET(RV_DEPS_OTIO_VERSION

# pcre2 https://github.com/PCRE2Project/pcre2
SET(RV_DEPS_PCRE2_VERSION
"10.43"
"10.47"
)
SET(RV_DEPS_PCRE2_DOWNLOAD_HASH
"e4c3f2a24eb5c15bec8360e50b3f0137"
"b55ec5acca85ffddc7d81c23f22bf176"
)

# png https://github.com/glennrp/libpng
Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/pcre2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_PCRE2" "pcre2-${RV_DEPS_PCRE2_VERSION
RV_SHOW_STANDARD_DEPS_VARIABLES()

SET(_download_url
"https://github.com/PCRE2Project/pcre2/archive/refs/tags/${_version}.zip"
"https://github.com/PCRE2Project/pcre2/archive/refs/tags/${_version}.tar.gz"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The .zip are available still. Was there a particular reason for the change?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zip and Tar seemed to be used about equally in this project (see below). However zip is slightly larger (arguably negligible for most projects with todays infra) so downloads are slightly slower and use more bandwidth. I thought I noticed more of the recent changes tended to be tar.gz so I was attempting to standardize on that.

I don't really care but it was more of my OCD on trying to standardize on a certain filetype. If you have a preference please let me know.

rel (.venv) ➜  /Users/moliver/dev/_openrv/OpenRV/cmake/dependencies git:(oiio3) grep github.com | grep tar | sort | uniq
doctest.cmake:    "https://github.com/doctest/doctest/archive/refs/tags/v${_version}.tar.gz"
expat.cmake:    "https://github.com/libexpat/libexpat/archive/refs/tags/R_${_version_underscored}.tar.gz"
glew.cmake:    "https://github.com/nigels-com/glew/archive/refs/tags/glew-${_version}.tar.gz"
jpegturbo.cmake:    "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${_version}.tar.gz"
oiio.cmake:    "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v${_version}.tar.gz"
openjpeg.cmake:    "https://github.com/uclouvain/openjpeg/archive/refs/tags/v${_version}.tar.gz"
openjph.cmake:    "https://github.com/aous72/OpenJPH/archive/refs/tags/${_version}.tar.gz"
openssl.cmake:        "https://github.com/openssl/openssl/releases/download/OpenSSL_${_version_underscored}/openssl-${_version}.tar.gz"
openssl.cmake:        "https://github.com/openssl/openssl/releases/download/openssl-${_version}/openssl-${_version}.tar.gz"
png.cmake:    "https://github.com/glennrp/libpng/archive/refs/tags/v${_version}.tar.gz"
raw.cmake:    "https://github.com/LibRaw/LibRaw/archive/refs/tags/${_version}.tar.gz"
webp.cmake:    "https://github.com/webmproject/libwebp/archive/refs/tags/v${_version}.tar.gz"
rel (.venv) ➜  /Users/moliver/dev/_openrv/OpenRV/cmake/dependencies git:(oiio3) grep github.com | grep tar | sort | uniq | wc -l
      12
rel (.venv) ➜  /Users/moliver/dev/_openrv/OpenRV/cmake/dependencies git:(oiio3) grep github.com | grep zip | sort | uniq
aja.cmake:    "https://github.com/aja-video/libajantv2/archive/refs/tags/ntv2_${_version_with_underscore}.zip"
atomic_ops.cmake:    "https://github.com/ivmai/libatomic_ops/archive/044573903530c4a8e8318e20a830d4a0531b2035.zip"
dav1d.cmake:    "https://github.com/videolan/dav1d/archive/refs/tags/${_version}.zip"
ffmpeg.cmake:    "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/${_version}.zip"
gc.cmake:    "https://github.com/ivmai/bdwgc/archive/refs/tags/v${_version}.zip"
imath.cmake:    "https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${_version}.zip"
imgui.cmake:    "https://github.com/pthom/imgui/archive/refs/tags/${_version}.zip"
ocio.cmake:    "https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${_version}.zip"
openexr.cmake:  URL "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${_version}.zip"
pcre2.cmake:    "https://github.com/PCRE2Project/pcre2/archive/refs/tags/${_version}.zip"
python3.cmake:    "https://github.com/python/cpython/archive/refs/tags/v${_python3_version}.zip"
spdlog.cmake:    "https://github.com/gabime/spdlog/archive/refs/tags/v${_version}.zip"
zlib.cmake:    "https://github.com/madler/zlib/archive/refs/tags/v${_version}.zip"
rel (.venv) ➜  /Users/moliver/dev/_openrv/OpenRV/cmake/dependencies git:(oiio3) grep github.com | grep zip | sort | uniq | wc -l
      13
rel (.venv) ➜  /Users/moliver/dev/_openrv/OpenRV/cmake/dependencies git:(oiio3)

)

SET(_download_hash
Expand Down Expand Up @@ -79,7 +79,7 @@ EXTERNALPROJECT_ADD(
${_target}
URL ${_download_url}
URL_MD5 ${_download_hash}
DOWNLOAD_NAME ${_target}_${_version}.zip
DOWNLOAD_NAME ${_target}_${_version}.tar.gz
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
SOURCE_DIR ${_source_dir}
Expand Down
Loading