diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-30 15:20:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 13:45:05 +0300 |
| commit | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (patch) | |
| tree | 9a8fa5b751f9b27380de9b3dde35f93086deda0b /build_files/build_environment | |
| parent | bf8aac0d491ae7ea9c52c5911f61f041cfffdafc (diff) | |
Build: require OpenJPEG 2.x minimum, remove bundled version.
* WITH_SYSTEM_OPENJPEG is removed and is now always on, this was already
the case for macOS and Windows.
* This should not break existing Linx builds. If there is no new enough
OpenJPEG installed, CMake will no find libopenjp2 and WITH_IMAGE_OPENJPEG
will be disabled.
* install_deps.sh was updated with new package names, since distributions
put this version in a new package.
Differential Revision: https://developer.blender.org/D3663
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index b6b7ba1f743..b47c01d52cb 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -815,7 +815,7 @@ DEPS_COMMON_INFO="\"COMMON DEPENDENCIES: Those libraries should be available as packages in all recent distributions (optional ones are [between brackets]): * Basics of dev environment (cmake, gcc, svn , git, ...). - * libjpeg, libpng, libtiff, [libopenjpeg], [libopenal]. + * libjpeg, libpng, libtiff, [openjpeg2], [libopenal]. * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed). * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp. * libsdl1.2, libglew, [libglewmx].\"" @@ -2631,8 +2631,8 @@ install_DEB() { THEORA_USE=true PRINT "" - # New Ubuntu crap (17.04 and more) have no openjpeg lib! - OPENJPEG_DEV="libopenjpeg-dev" + # We need openjp2, libopenjpeg is an old version + OPENJPEG_DEV="libopenjp2-7-dev" check_package_DEB $OPENJPEG_DEV if [ $? -eq 0 ]; then _packages="$_packages $OPENJPEG_DEV" @@ -3169,7 +3169,7 @@ install_RPM() { fi # These libs should always be available in fedora/suse official repository... - OPENJPEG_DEV="openjpeg-devel" + OPENJPEG_DEV="openjpeg2-devel" VORBIS_DEV="libvorbis-devel" OGG_DEV="libogg-devel" THEORA_DEV="libtheora-devel" @@ -3639,7 +3639,7 @@ install_ARCH() { fi # These libs should always be available in arch official repository... - OPENJPEG_DEV="openjpeg" + OPENJPEG_DEV="openjpeg2" VORBIS_DEV="libvorbis" OGG_DEV="libogg" THEORA_DEV="libtheora" |