Commit 8500fd28 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Remove remaining traces of openjpeg

parent 46af7d5d
......@@ -425,9 +425,6 @@ macro_log_feature(TIFF_FOUND "tiff" "TIFF Library and Utilities" "http://www.rem
macro_optional_find_package(JPEG)
macro_log_feature(JPEG_FOUND "jpeg" "Free library for JPEG image compression. Note: libjpeg8 is NOT supported." "http://www.libjpeg-turbo.org" FALSE "" "Required by the Krita JPEG filter")
macro_optional_find_package(OpenJPEG)
macro_log_feature(OPENJPEG_FOUND "openjpeg" "Free library for JPEG 2000 image compression" "http://www.openjpeg.org" FALSE "" "Required by the Krita JPEG 2000 filter")
set(LIBRAW_MIN_VERSION "0.16")
macro_optional_find_package(LibRaw ${LIBRAW_MIN_VERSION})
macro_log_feature(LIBRAW_FOUND "LibRaw" "Library to decode RAW images" "http://www.libraw.org" FALSE "" "Required to build the raw import plugin")
......
......@@ -53,7 +53,6 @@ Krita depends on:
* libraw
* opencolorio
* openexr
* openjpeg
* png
* poppler-qt5
* pthreads
......
......@@ -116,8 +116,6 @@ cmake3 --build . --config RelWithDebInfo --target ext_vc
cmake3 --build . --config RelWithDebInfo --target ext_tiff
cmake3 --build . --config RelWithDebInfo --target ext_jpeg
cmake3 --build . --config RelWithDebInfo --target ext_libraw
# XXX: this builds, but cmake3 never manages to find the library
#cmake3 --build . --config RelWithDebInfo --target ext_openjpeg
cmake3 --build . --config RelWithDebInfo --target ext_kcrash
cmake3 --build . --config RelWithDebInfo --target ext_poppler
cmake3 --build . --config RelWithDebInfo --target ext_gsl
......
......@@ -72,7 +72,6 @@ parts:
- libjpeg-dev
- liblcms2-dev
- libopenexr-dev
- libopenjpeg-dev
- libpng12-dev
- libpoppler-qt4-dev
- libtiff5-dev
......
......@@ -14,6 +14,5 @@ cmake --build . --config RelWithDebInfo --target ext_png
cmake --build . --config RelWithDebInfo --target ext_tiff
cmake --build . --config RelWithDebInfo --target ext_vc
cmake --build . --config RelWithDebInfo --target ext_libraw
cmake --build . --config RelWithDebInfo --target ext_openjpeg
cmake --build . --config RelWithDebInfo --target ext_kwindowsystem
cmake --build . --config RelWithDebInfo --target ext_gsl
......@@ -20,7 +20,6 @@ cmake --build . --config RelWithDebInfo --target ext_tiff
cmake --build . --config RelWithDebInfo --target ext_gsl
cmake --build . --config RelWithDebInfo --target ext_vc
cmake --build . --config RelWithDebInfo --target ext_libraw
rem cmake --build . --config RelWithDebInfo --target ext_openjpeg
rem cmake --build . --config RelWithDebInfo --target ext_freetype
cmake --build . --config RelWithDebInfo --target ext_ocio
cmake --build . --config RelWithDebInfo --target ext_openexr
......
......@@ -15,7 +15,7 @@ export PATH=$BUILDROOT/mxe/usr/bin:$BUILDROOT/mxe/usr/x86_64-w64-mingw32.shared/
# Use i686-w64-mingw32.shared for 32 bits builds
# note: vc is 1.2, so we either need zagge's branch, or you need to build Vc 0.75
# yourself. Make sure you use -DBUILD_TESTING=OFF for Vc
make MXE_TARGETS=x86_64-w64-mingw32.shared gcc boost curl eigen exiv2 expat fftw fontconfig freetype gettext ilmbase openexr jpeg lcms libpng libraw opencolorio openjpeg qt5 qtscript tiff vc zlib gsl
make MXE_TARGETS=x86_64-w64-mingw32.shared gcc boost curl eigen exiv2 expat fftw fontconfig freetype gettext ilmbase openexr jpeg lcms libpng libraw opencolorio qt5 qtscript tiff vc zlib gsl
cd $BUILDROOT
git clone git://anongit.kde.org/krita.git
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment