[Digikam-devel] Review Request 108821: fix libjpeg detection for libjpeg-turbo

[Kevin Kofler]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/108821/
-----------------------------------------------------------

(Updated Feb. 4, 2014, 10:02 p.m.)


Status
------

This change has been discarded.


Review request for Digikam and KDE Graphics.


Repository: libkdcraw


Description
-------

This fixes the libjpeg detection to check for the availability of jpeg_mem_src rather than for JPEG_LIB_VERSION, allowing to build the JPEG functionality with libjpeg-turbo >= 1.2.90.

RawSpeed/DngDecoderSlices.cpp tries to define its own jpeg_mem_src function if JPEG_LIB_VERSION < 80, so patch it to use the detected USE_JPEG8 instead to avoid the redefinition and the resulting compiler error.

Note: This patch is against 4.10, master is even more broken due to http://commits.kde.org/libkdcraw/016a3f26084b4bf7e0302ede362d937eb2dd4910 ("Fix compilation on Windows"), which unconditionally removes the USE_JPEG define, meaning JPEG support will never be built at all. This is clearly incorrect.


Diffs
-----

  libraw/CMakeLists.txt 581e7b1 
  libraw/RawSpeed/DngDecoderSlices.cpp 28a137e 
  libraw/RawSpeed/rawspeed.jpeg-version.patch PRE-CREATION 

Diff: https://git.reviewboard.kde.org/r/108821/diff/


Testing
-------

Builds (and detects jpeg_mem_src) in Rawhide (libkdcraw 4.10.0 release, libjpeg-turbo 20130204 snapshot (svn922, approx. 1.2.90)).


Thanks,

Kevin Kofler

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20140204/3c71f6dc/attachment.html>