5fae2503bf
This reverts commit f12204196fb1ee985ab9745cf9c70877601145f9. Campbell, sorry. have to revert this for the time being. We've missed some very important bits, such as: - FFmpeg is usually linked against OpenJPEG - OIIO needs OpenJPEG as well. For FFmpeg issues we can either disable OpenJPEG there (since we don't really use it), or bump FFmpeg to version 3.1.1 which can use either of OpenJPEG 1.5 or 2.1. For OIIO we do need OpenJPEG support (otherwise Cycles will not be able to use j2k/j2c textures) and currently there is NO solution to make OIIO working with OpenJPEG 2.1. According to Matthias Fauconneau (aka mfv) Larry is working on the patch to get OIIO work with OpenJPEG 2.1, but it'll take some time still. I've tried to look into support of some sort of build system flag and do ifdefs, but it all becomes quite nasty, especially with bundled OpenJPEG bumped to 2.1. Surely such an update is something we'll have to apply to but at this exact moment it causes quite some pain for all developers. Suggest to wait for until OIIO supports OpenJPEG 2.1 and then go with the updates for real.
90 lines
1.5 KiB
CMake
90 lines
1.5 KiB
CMake
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# The Original Code is Copyright (C) 2006, Blender Foundation
|
|
# All rights reserved.
|
|
#
|
|
# The Original Code is: all of this file.
|
|
#
|
|
# Contributor(s): Jacques Beaurain.
|
|
#
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
set(INC
|
|
.
|
|
)
|
|
|
|
set(INC_SYS
|
|
|
|
)
|
|
|
|
add_definitions(${OPENJPEG_DEFINES})
|
|
|
|
set(SRC
|
|
bio.c
|
|
cio.c
|
|
dwt.c
|
|
event.c
|
|
image.c
|
|
j2k.c
|
|
j2k_lib.c
|
|
jp2.c
|
|
jpt.c
|
|
mct.c
|
|
mqc.c
|
|
openjpeg.c
|
|
pi.c
|
|
raw.c
|
|
t1.c
|
|
t2.c
|
|
tcd.c
|
|
tgt.c
|
|
cidx_manager.c
|
|
phix_manager.c
|
|
ppix_manager.c
|
|
thix_manager.c
|
|
tpix_manager.c
|
|
|
|
bio.h
|
|
cio.h
|
|
dwt.h
|
|
event.h
|
|
fix.h
|
|
image.h
|
|
int.h
|
|
j2k.h
|
|
j2k_lib.h
|
|
jp2.h
|
|
jpt.h
|
|
mct.h
|
|
mqc.h
|
|
openjpeg.h
|
|
opj_includes.h
|
|
opj_malloc.h
|
|
pi.h
|
|
raw.h
|
|
t1.h
|
|
t1_luts.h
|
|
t2.h
|
|
tcd.h
|
|
tgt.h
|
|
cidx_manager.h
|
|
indexbox_manager.h
|
|
opj_config.h
|
|
)
|
|
|
|
blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
|