[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/plugins/formats: The jpeg situation is even more confusing...
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2015-04-21 17:33:34
Message-ID: E1Ykc3C-0001Dy-78 () scm ! kde ! org
[Download RAW message or body]

Git commit a20dcb5ae1233146fb5b80eacece8d766be61905 by Boudewijn Rempt.
Committed on 21/04/2015 at 17:30.
Pushed by rempt into branch 'calligra/2.9'.

The jpeg situation is even more confusing...

Let's build anyway, but warn people to use libjpegturbo. If anyone
has a better solution, feel free to help me out here...

M  +0    -7    krita/plugins/formats/CMakeLists.txt

http://commits.kde.org/calligra/a20dcb5ae1233146fb5b80eacece8d766be61905

diff --git a/krita/plugins/formats/CMakeLists.txt b/krita/plugins/formats/C=
MakeLists.txt
index 3c2d591..4d5342b 100644
--- a/krita/plugins/formats/CMakeLists.txt
+++ b/krita/plugins/formats/CMakeLists.txt
@@ -14,13 +14,6 @@ macro_optional_find_package(TIFF)
 macro_log_feature(TIFF_FOUND "tiff" "TIFF Library and Utilities" "http://w=
ww.remotesensing.org/libtiff" FALSE "" "Required by the Krita TIFF filter")
 =

 macro_optional_find_package(JPEG)
-if (JPEG_FOUND)
-    DETECT_JPEG()
-    if (JPEG_LIB_VERSION GREATER 70)
-        set(JPEG_FOUND FALSE)
-        message("Detected libpeg 8 or 9: this is NOT supported.")
-    endif()
-endif()
 macro_log_feature(JPEG_FOUND "jpeg" "Free library for JPEG image compressi=
on. Note: libjpeg8 is NOT supported." "http://www.libjpeg-turbo.org" FALSE =
"" "Required by the Krita JPEG filter")
 =

 macro_optional_find_package(Kdcraw)
[prev in list] [next in list] [prev in thread] [next in thread]