Review Request 108821: fix libjpeg detection for libjpeg-turbo

[Kevin Kofler]

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

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

>
> 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.

Ananta, this was your commit, could you please check Kevin's investigation?
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

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

Ship it!

Ship It!

- Gilles

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

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

On May 7th, 2013, 1:46 p.m. UTC, Gilles Caulier wrote:

Ship It!

Problem fixed by Ananta by this commit :

http://commits.kde.org/libkdcraw/908db171d4eba6989abb4e1a450e1d79c3c15d4e

- Gilles

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Albert Astals Cid]

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

On May 7th, 2013, 1:46 p.m. UTC, Gilles Caulier wrote:

Ship It!

On May 7th, 2013, 1:47 p.m. UTC, Gilles Caulier wrote:

Problem fixed by Ananta by this commit :

http://commits.kde.org/libkdcraw/908db171d4eba6989abb4e1a450e1d79c3c15d4e

Does really that one line commit do the same as Kevin's bigger commit? Shall this be marked as submitted then?

- Albert

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Kevin Kofler]

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

On May 7th, 2013, 1:46 p.m. UTC, Gilles Caulier wrote:

Ship It!

On May 7th, 2013, 1:47 p.m. UTC, Gilles Caulier wrote:

Problem fixed by Ananta by this commit :

http://commits.kde.org/libkdcraw/908db171d4eba6989abb4e1a450e1d79c3c15d4e

On May 7th, 2013, 5:11 p.m. UTC, Albert Astals Cid wrote:

Does really that one line commit do the same as Kevin's bigger commit? Shall this be marked as submitted then?

No, that one-line commit fixes only the "master is even more broken" issue from my "Note".

- Kevin

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Albert Astals Cid]

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

Ping?

- Albert Astals Cid

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Kevin Kofler]

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

On October 27th, 2013, 6:24 p.m. UTC, Albert Astals Cid wrote:

Ping?

I'm still waiting for Gilles to explicitly approve my patch. (The commit he pointed to (saying "problem fixed") does NOT fix the issue.)

- Kevin

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Heena Mahour]

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

>MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "JPEG image format support" "http://www.ijg.org" FALSE "8" "needed for the LibRaw DNG lossy codec")
It should be MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "JPEG image format support" "http://www.ijg.org" FALSE "80" "needed for the LibRaw DNG lossy codec").
Please remove whitespaces .

- Heena Mahour

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

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

This patch is obsolete now for libkdcraw (master), since libraw/RawSpeed source code have been dropped. External dependencies are used instead.

- Gilles Caulier

On February 6th, 2013, 10:05 p.m. UTC, Kevin Kofler wrote:

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

Updated Feb. 6, 2013, 10:05 p.m.

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Kevin Kofler]

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

This change has been discarded.

Review request for Digikam and KDE Graphics.

By Kevin Kofler.

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

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.

Testing

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

Diffs

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

View Diff

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel