[libjpeg-turbo] Update to libjpeg-turbo 2.0.1 by UnaNancyOwen · Pull Request #4635 · microsoft/vcpkg

UnaNancyOwen · 2018-11-01T17:14:41Z

Update libjpeg-turbo port to libjpeg-turbo 2.0.0.
It contains bug fixes and performance improvements.

alexkaratarakis · 2018-11-01T20:14:25Z

Similar to #4005 but there are diffs.

Update libjpeg-turbo port to libjpeg-turbo 2.0.0.

UnaNancyOwen · 2018-11-02T14:08:57Z

@alexkaratarakis Thank you for the information. I was read earlier sent pull request #4005. But, It contains some mistakes. It will install turbojpeg, but optimized libjpeg will not be installed. It is bug of patch.

Should I feedback to earlier sent pull request? What do you think?
(However, It seems that pull request has not been discussed for a while.)

alexkaratarakis · 2018-11-02T20:58:17Z

@UnaNancyOwen It has been a while from the previous PR, so I think we should keep the discussions here.

Currently running it through CI, will update with the results! :)

alexkaratarakis · 2018-11-04T02:36:29Z

There are regressions for libjpeg-turbo itself as well as freeimage and vxl. Doesn't look too bad :)

UnaNancyOwen · 2018-11-04T14:40:59Z

In the case of UWP (x64-uwp, arm-uwp), CMAKE_SYSTEM_PROCESSOR seems to be empty.
Therefore, An error occurs in simd/CMakeLists.txt#L372, because the CPU architecture is not set to CPU_TYPE in CMakeLists.txt#L41-L68.
In order to solve this problem, I have two ideas.

Add CMake option -DCMAKE_SYSTEM_PROCESSOR={x86|arm} in libjpeg-turbo/portfile.cmake.
Implement triplet variable VCPKG_CMAKE_SYSTEM_PROCESSOR to vcpkg. (like VCPKG_CMAKE_SYSTEM_NAME, VCPKG_CMAKE_SYSTEM_VERSION)

UnaNancyOwen · 2018-11-08T13:00:08Z

@alexkaratarakis @ras0219-msft What do you think?

Fix performing post-build validation on linux by remove man direcotry and files.

UnaNancyOwen · 2018-11-09T08:00:26Z

(It may be different from the actual machine because I tried on virtual machine,) In the case of Linux (x64-linux), CMAKE_SYSTEM_PROCESSOR seems to be empty such as case of UWP.
The problem about CMAKE_SYSTEM_PROCESSOR is not problem of this port alone.
I think it should be discussed and fix with another issues or pull request.

UnaNancyOwen · 2018-11-09T08:16:25Z

If you don't find other problem, I think ready to merge this pull request.

UnaNancyOwen · 2018-11-10T05:04:18Z

freeimage:x64-windows

freeimage:x64-windows-static

freeimage:x86-windows

In case of Debug configuration, find_package(JPEG) can find debug/lib/jpeg.lib, but it is include in release variable (JPEG_LIBRARY_RELEASE).

Debug

-- Found JPEG: C:/vcpkg/installed/x64-windows/debug/lib/jpeg.lib (found version "62") 
-- --------------------------------------
-- JPEG_INCLUDE_DIR : C:/vcpkg/installed/x64-windows/include
-- JPEG_LIBRARY_RELEASE : C:/vcpkg/installed/x64-windows/debug/lib/jpeg.lib
-- JPEG_LIBRARY_DEBUG : JPEG_LIBRARY_DEBUG-NOTFOUND
-- --------------------------------------

Release

-- Found JPEG: C:/vcpkg/installed/x64-windows/lib/jpeg.lib (found version "62") 
-- --------------------------------------
-- JPEG_INCLUDE_DIR : C:/vcpkg/installed/x64-windows/include
-- JPEG_LIBRARY_RELEASE : C:/vcpkg/installed/x64-windows/lib/jpeg.lib
-- JPEG_LIBRARY_DEBUG : JPEG_LIBRARY_DEBUG-NOTFOUND
-- --------------------------------------

In addition, libjpeg-turbo 2.0.0 includes two additional functions. (jpeg_read_icc_profile() and jpeg_write_icc_profile()) Please read this release note.
Therefor, It is occurs error C2556 about override, because jpeg_read_icc_profile() is already defined in PluginJPEG.cpp of freeimage.

C:\vcpkg\buildtrees\freeimage\src\FreeImage\Source\FreeImage\PluginJPEG.cpp(506): error C2556: 'BOOL jpeg_read_icc_profile(j_decompress_ptr,JOCTET **,unsigned int *)': overloaded function differs only by return type from 'boolean jpeg_read_icc_profile(j_decompress_ptr,JOCTET **,unsigned int *)'
C:\vcpkg\installed\x64-windows\include\jpeglib.h(1066): note: see declaration of 'jpeg_read_icc_profile'
C:\vcpkg\buildtrees\freeimage\src\FreeImage\Source\FreeImage\PluginJPEG.cpp(506): error C2371: 'jpeg_read_icc_profile': redefinition; different basic types
C:\vcpkg\installed\x64-windows\include\jpeglib.h(1066): note: see declaration of 'jpeg_read_icc_profile'

UnaNancyOwen · 2018-11-11T14:29:44Z

freeimage:x64-windows

freeimage:x64-windows-static

freeimage:x86-windows

@alexkaratarakis I fixed these in #4703. Please review it.

UnaNancyOwen · 2018-11-11T14:31:24Z

libjpeg-turbo:arm-uwp

libjpeg-turbo:x64-linux

libjpeg-turbo:x64-uwp

@alexkaratarakis I fixed these in this pull request and #4688. Please review it.

UnaNancyOwen · 2018-11-12T13:24:18Z

vxl:x64-windows-static

vxl:x86-windows

@alexkaratarakis I fixed these in #4711. Please review it. (It does not seem to be related to this change.)

UnaNancyOwen · 2018-11-12T13:28:42Z

It seems that all problems has been solved! 👍

alexkaratarakis · 2018-11-19T22:44:19Z

Note: Only #4688 remaining, everything else is merged.

Fix issue that fails rename when VCPKG_BUILD_TYPE is set.

UnaNancyOwen · 2018-11-22T15:04:18Z

Fix #4754

lhecker · 2018-11-27T11:10:05Z

@UnaNancyOwen libjpeg-turbo 2.0.1 was released 2 weeks ago and contains some few very significant bug fixes.
IMHO it might be beneficial to upgrade to 2.0.1 before we merge this PR.

Furthermore in my limited testing I'd like to note that WITH_SIMD should now work on all x86/x86_64 platforms and should IMO be enabled everywhere instead of just for WindowsStore.
In my experience that e.g. boosts JPEG decode performance by 4x.

Update libjpeg-turbo port to libjpeg-turbo 2.0.1.

UnaNancyOwen · 2018-11-27T17:40:14Z

@lhecker Thanks! 👍

UnaNancyOwen · 2018-11-28T15:29:39Z

@alexkaratarakis @ras0219-msft I think ready to merge.

Rastaban · 2019-03-14T23:31:27Z

Resolved merge conflicts and running CI tests.

Rastaban · 2019-03-15T17:54:00Z

I am seeing the following regressions:

Processing arm-uwp                        409 vs 415
     libjpeg-turbo                 **regression**                Fail vs Pass
 Processing x64-linux                      605 vs 635
     libjpeg-turbo                 **regression**                Fail vs Pass
 Processing x64-osx                        614 vs 630
     qt5-base                      **regression**                Fail vs Pass
 Processing x64-uwp                        435 vs 444
     libjpeg-turbo                 **regression**                Fail vs Pass

Rastaban · 2019-05-02T22:13:49Z

I think the only thing holding back this PR is the vcpkg CMAKE_SYSTEM_PROCESSOR bug.

vicroms · 2019-05-02T22:54:03Z

@Rastaban

The fix in #5697 causes many regressions that I haven't had the time to look into, if there's a local workaround that could enable this PR to be merged it would be a preferable short-term solution.

UnaNancyOwen · 2019-05-06T16:57:01Z

@Rastaban @vicroms Thanks!

UnaNancyOwen force-pushed the update_libjpeg-turbo branch from 052fdf1 to 2340edd Compare November 2, 2018 13:34

[libjpeg-turbo] Update to libjpeg-turbo 2.0.0

80b1604

Update libjpeg-turbo port to libjpeg-turbo 2.0.0.

UnaNancyOwen force-pushed the update_libjpeg-turbo branch from 2340edd to 80b1604 Compare November 2, 2018 13:38

UnaNancyOwen mentioned this pull request Nov 9, 2018

WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets #4688

Merged

[libjpeg-turbo] Fix performing post-build validation on linux

658e279

Fix performing post-build validation on linux by remove man direcotry and files.

UnaNancyOwen mentioned this pull request Nov 11, 2018

[freeimage] Update to FreeImage 3.18.0 and Fix function overload with libjpeg-turbo 2.0.0 #4703

Merged

alexkaratarakis self-assigned this Nov 13, 2018

[libjpeg-turbo] Support VCPKG_BUILD_TYPE

9bdbde6

Fix issue that fails rename when VCPKG_BUILD_TYPE is set.

[libjpeg-turbo] Update to libjpeg-turbo 2.0.1

53d5dd6

Update libjpeg-turbo port to libjpeg-turbo 2.0.1.

UnaNancyOwen changed the title ~~[libjpeg-turbo] Update to libjpeg-turbo 2.0.0~~ [libjpeg-turbo] Update to libjpeg-turbo 2.0.1 Nov 27, 2018

JackBoosY unassigned alexkaratarakis Mar 14, 2019

Merge branch 'master' into update_libjpeg-turbo

6e19078

Rastaban self-assigned this Mar 14, 2019

[libjpeg-turbo] Fix merge

a2f23fe

vicroms mentioned this pull request Mar 15, 2019

[wip] Fix CMAKE_SYSTEM_PROCESSOR (Resubmission of #4688) #5697

Closed

LarryIII mentioned this pull request Mar 25, 2019

libjpeg-turbo fails when VCPKG_BUILD_TYPE set to release #4754

Closed

Rastaban mentioned this pull request May 2, 2019

vcpkg: fix toolchain to correctly set the CMAKE_SYSTEM_PROCESSOR vari… #4970

Closed

[libjpeg-turbo] workaround CMAKE_SYSTEM_PROCESSOR vcpkg bug

ef35fbd

Rastaban merged commit d53488c into microsoft:master May 6, 2019

LarryIII mentioned this pull request May 7, 2019

OpenCV,libjpeg-turbo build with set(VCPKG_BUILD_TYPE release) int triplet fails #5557

Closed

ras0219-msft mentioned this pull request May 20, 2019

Update libjpeg-turbo to 2.0.0 #4005

Closed

Conversation

UnaNancyOwen commented Nov 1, 2018

Uh oh!

alexkaratarakis commented Nov 1, 2018

Uh oh!

UnaNancyOwen commented Nov 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexkaratarakis commented Nov 2, 2018

Uh oh!

alexkaratarakis commented Nov 4, 2018

Uh oh!

UnaNancyOwen commented Nov 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UnaNancyOwen commented Nov 8, 2018

Uh oh!

UnaNancyOwen commented Nov 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UnaNancyOwen commented Nov 9, 2018

Uh oh!

UnaNancyOwen commented Nov 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UnaNancyOwen commented Nov 11, 2018 • edited by JackBoosY Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UnaNancyOwen commented Nov 11, 2018

Uh oh!

UnaNancyOwen commented Nov 12, 2018

Uh oh!

UnaNancyOwen commented Nov 12, 2018

Uh oh!

alexkaratarakis commented Nov 19, 2018

Uh oh!

UnaNancyOwen commented Nov 22, 2018

Uh oh!

lhecker commented Nov 27, 2018

Uh oh!

UnaNancyOwen commented Nov 27, 2018

Uh oh!

UnaNancyOwen commented Nov 28, 2018

Uh oh!

Rastaban commented Mar 14, 2019

Uh oh!

Rastaban commented Mar 15, 2019

Uh oh!

Rastaban commented May 2, 2019

Uh oh!

vicroms commented May 2, 2019

Uh oh!

UnaNancyOwen commented May 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

UnaNancyOwen commented Nov 2, 2018 •

edited

Loading

UnaNancyOwen commented Nov 4, 2018 •

edited

Loading

UnaNancyOwen commented Nov 9, 2018 •

edited

Loading

UnaNancyOwen commented Nov 10, 2018 •

edited

Loading

UnaNancyOwen commented Nov 11, 2018 •

edited by JackBoosY

Loading