Differential D3663

Build: require OpenJPEG 2.x minimum, remove bundled version.
ClosedPublic
Actions

Authored by Brecht Van Lommel (brecht) on Aug 30 2018, 6:07 PM.

Tags

None

Subscribers

Arto Kitula (akitula)

Details

Reviewers

Campbell Barton (campbellbarton)
Ray Molenkamp (LazyDodo)
Bastien Montagne (mont29)

Commits

rC7af9923649f9: Build: require OpenJPEG 2.x minimum, remove bundled version
rBSa1651ddc98ec: Build: require OpenJPEG 2.x minimum, remove bundled version.
rBa1651ddc98ec: Build: require OpenJPEG 2.x minimum, remove bundled version.

Summary

There is no reason anymore to bundle this as far as I know.
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.

Diff Detail

Repository: rB Blender

Event Timeline

Brecht Van Lommel (brecht) created this revision.Aug 30 2018, 6:07 PM

Harbormaster completed remote builds in B1987: Diff 11728.Aug 30 2018, 6:07 PM

This needs to wait until @Arto Kitula (akitula) is done upgrading macOS libs though.

No issues on windows, go flight!

This revision is now accepted and ready to land.Aug 30 2018, 6:29 PM

Campbell Barton (campbellbarton) accepted this revision.Sep 5 2018, 4:13 AM

Ray Molenkamp (LazyDodo) mentioned this in T56718: WITH_OPENIMAGENIO sets to "ON" needs WITH_SYSTEM_OPENJPEG sets to "ON".Sep 8 2018, 1:07 AM

Closed by commit rBa1651ddc98ec: Build: require OpenJPEG 2.x minimum, remove bundled version. (authored by Brecht Van Lommel (brecht)). · Explain WhySep 11 2018, 12:47 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

16 lines

build_files/

build_environment/

install_deps.sh

10 lines

buildbot/

config/

blender_linux.cmake

4 lines

cmake/

Modules/

FindOpenJPEG.cmake

2 lines

2 lines

platform/

platform_apple.cmake

1 line

extern/

4 lines

libopenjpeg/

indexbox_manager.h

intern/

cycles/

test/

6 lines

source/

blender/

imbuf/

intern/

1023 lines

Diff 11822

CMakeLists.txt

Loading...

build_files/build_environment/install_deps.sh

Loading...

build_files/buildbot/config/blender_linux.cmake

Loading...

build_files/cmake/Modules/FindOpenJPEG.cmake

Loading...

build_files/cmake/macros.cmake

Loading...

build_files/cmake/platform/platform_apple.cmake

Loading...

extern/CMakeLists.txt

Loading...

extern/libopenjpeg/CMakeLists.txt

Loading...

extern/libopenjpeg/README.blender

Loading...

extern/libopenjpeg/bio.h

Loading...

extern/libopenjpeg/bio.c

Loading...

extern/libopenjpeg/cidx_manager.h

Loading...

extern/libopenjpeg/cidx_manager.c

Loading...

extern/libopenjpeg/cio.h

Loading...

extern/libopenjpeg/cio.c

Loading...

extern/libopenjpeg/dwt.h

Loading...

extern/libopenjpeg/dwt.c

Loading...

extern/libopenjpeg/event.h

Loading...

extern/libopenjpeg/event.c

Loading...

extern/libopenjpeg/fix.h

Loading...

extern/libopenjpeg/image.h

Loading...

extern/libopenjpeg/image.c

Loading...

extern/libopenjpeg/indexbox_manager.h

Loading...

extern/libopenjpeg/int.h

Loading...

extern/libopenjpeg/j2k.h

Loading...

extern/libopenjpeg/j2k.c

Loading...

extern/libopenjpeg/j2k_lib.h

Loading...

extern/libopenjpeg/j2k_lib.c

Loading...

extern/libopenjpeg/jp2.h

Loading...

extern/libopenjpeg/jp2.c

Loading...

extern/libopenjpeg/jpt.h

Loading...

extern/libopenjpeg/jpt.c

Loading...

extern/libopenjpeg/license.txt

Loading...

extern/libopenjpeg/mct.h

Loading...

extern/libopenjpeg/mct.c

Loading...

extern/libopenjpeg/mqc.h

Loading...

extern/libopenjpeg/mqc.c

Loading...

extern/libopenjpeg/openjpeg.h

Loading...

extern/libopenjpeg/openjpeg.c

Loading...

extern/libopenjpeg/opj_config.h

Loading...

extern/libopenjpeg/opj_includes.h

Loading...

extern/libopenjpeg/opj_malloc.h

Loading...

extern/libopenjpeg/phix_manager.c

Loading...

extern/libopenjpeg/pi.h

Loading...

extern/libopenjpeg/pi.c

Loading...

extern/libopenjpeg/ppix_manager.c

Loading...

extern/libopenjpeg/raw.h

Loading...

extern/libopenjpeg/raw.c

Loading...

extern/libopenjpeg/t1.h

Loading...

extern/libopenjpeg/t1.c

Loading...

extern/libopenjpeg/t1_luts.h

Loading...

extern/libopenjpeg/t2.h

Loading...

extern/libopenjpeg/t2.c

Loading...

extern/libopenjpeg/tcd.h

Loading...

extern/libopenjpeg/tcd.c

Loading...

extern/libopenjpeg/tgt.h

Loading...

extern/libopenjpeg/tgt.c

Loading...

extern/libopenjpeg/thix_manager.c

Loading...

extern/libopenjpeg/tpix_manager.c

Loading...

intern/cycles/test/CMakeLists.txt

Loading...

source/blender/imbuf/intern/jp2.c

Loading...