diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 08:54:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 08:54:07 +0300 |
| commit | 2597cd39982100efeeb13b597f3e432ef9346d85 (patch) | |
| tree | 96b7cd824f5038d5a63ec025957e4503e544f95f /build_files/build_environment | |
| parent | 7eecc9407415e18eaab2ded2fcc883edbf58c633 (diff) | |
| parent | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (diff) | |
Merge branch 'master' into blender2.8
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 be6e8384ac9..7d5ea18aa7e 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -810,7 +810,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].\"" @@ -2626,8 +2626,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" @@ -3164,7 +3164,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" @@ -3634,7 +3634,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" |