From a1651ddc98ec760e522ea2ea8169b726661fa2e6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 30 Aug 2018 14:20:19 +0200 Subject: 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 --- build_files/build_environment/install_deps.sh | 10 +++++----- build_files/buildbot/config/blender_linux.cmake | 4 ---- build_files/cmake/Modules/FindOpenJPEG.cmake | 2 -- build_files/cmake/macros.cmake | 2 +- build_files/cmake/platform/platform_apple.cmake | 1 - 5 files changed, 6 insertions(+), 13 deletions(-) (limited to 'build_files') 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" diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 1c400339dfe..9ba91a9a463 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -172,10 +172,6 @@ set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE) set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) -# TODO(sergey): Move up to the rest of WITH_SYSTEM and DYNLOAD configuration, -# once old chroot is officially retired. -set(WITH_SYSTEM_OPENJPEG ON CACHE BOOL "" FORCE) - # We need to link OpenCOLLADA against PCRE library. Even though it is not installed # on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its # library pointing to a valid one. diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index a6c28be6782..20d1994c7ba 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -41,12 +41,10 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR ${_openjpeg_SEARCH_DIRS} PATH_SUFFIXES include - include/openjpeg-1.5 ) FIND_LIBRARY(OPENJPEG_LIBRARY NAMES - openjpeg openjp2 HINTS ${_openjpeg_SEARCH_DIRS} diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 54a41f95819..69a1eb2eb3a 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -448,7 +448,7 @@ function(setup_liblinks if(WITH_IMAGE_OPENEXR) target_link_libraries(${target} ${OPENEXR_LIBRARIES}) endif() - if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) + if(WITH_IMAGE_OPENJPEG) target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) endif() if(WITH_CODEC_FFMPEG) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 2fc7c2cdd9d..b10a2e175c1 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -166,7 +166,6 @@ endif() if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG) # use openjpeg from libdir that is linked into ffmpeg set(OPENJPEG ${LIBDIR}/openjpeg) - set(WITH_SYSTEM_OPENJPEG ON) set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include) set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) endif() -- cgit v1.2.3