Update jpeg turbo version

CMake/External_libjpeg-turbo.cmake

@@ -2,71 +2,51 @@
 include(External_yasm)
 list(APPEND libjpeg-turbo_DEPENDS yasm)
 
-if(WIN32)
-  ExternalProject_Add(libjpeg-turbo
-    URL ${libjpeg-turbo_url}
-    URL_MD5 ${libjpeg-turbo_md5}
-    DEPENDS ${libjpeg-turbo_DEPENDS}
-    ${COMMON_EP_ARGS}
-    ${COMMON_CMAKE_EP_ARGS}
-    PATCH_COMMAND ${CMAKE_COMMAND}
-        -Dlibjpeg-turbo_patch:PATH=${fletch_SOURCE_DIR}/Patches/libjpeg-turbo
-        -Dlibjpeg-turbo_source:PATH=${fletch_BUILD_PREFIX}/src/libjpeg-turbo
-        -P ${fletch_SOURCE_DIR}/Patches/libjpeg-turbo/Patch.cmake
-    CMAKE_ARGS
-      -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-      -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-      -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-      -DCMAKE_INSTALL_PREFIX:PATH=${fletch_BUILD_INSTALL_PREFIX}
-      -DNASM:FILEPATH=${fletch_YASM} -g vc8
-    )
+# We need some special Apple treatment
+if(APPLE)
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_libjpeg-turbo_ARGS_APPLE --host x86_64-apple-darwin )
+  endif()
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    # Need to investigate/apply the following command-line options for 32-bit when required.
+    # Configure commandline comes from the BUILDING.txt file in libjpeg-turbo source
+    # "--host i686-apple-darwin CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk
+    # -mmacosx-version-min=10.5 -O3 -m32' LDFLAGS='-isysroot
+    # /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -m32'")
+
+  endif()
+endif()
+
+ExternalProject_Add(libjpeg-turbo
+  URL ${libjpeg-turbo_url}
+  URL_MD5 ${libjpeg-turbo_md5}
+  DEPENDS ${libjpeg-turbo_DEPENDS}
+  ${COMMON_EP_ARGS}
+  ${COMMON_CMAKE_EP_ARGS}
+  PATCH_COMMAND ${CMAKE_COMMAND}
+    -Dlibjpeg-turbo_patch:PATH=${fletch_SOURCE_DIR}/Patches/libjpeg-turbo
+    -Dlibjpeg-turbo_source:PATH=${fletch_BUILD_PREFIX}/src/libjpeg-turbo
+    -P ${fletch_SOURCE_DIR}/Patches/libjpeg-turbo/Patch.cmake
+  CMAKE_ARGS
+    -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+    -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+    -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+    -DCMAKE_INSTALL_PREFIX:PATH=${fletch_BUILD_INSTALL_PREFIX}
+    -DNASM:FILEPATH=${fletch_YASM} -g vc8
+  )
 
+if (WIN32)
   ExternalProject_Add_Step(libjpeg-turbo fixup-install
     COMMAND ${CMAKE_COMMAND} -E copy
-      ${fletch_BUILD_INSTALL_PREFIX}/lib/jpeg.lib
-      ${fletch_BUILD_INSTALL_PREFIX}/lib/libjpeg.lib
+    ${fletch_BUILD_INSTALL_PREFIX}/lib/jpeg.lib
+    ${fletch_BUILD_INSTALL_PREFIX}/lib/libjpeg.lib
     DEPENDEES install
     )
-
-  fletch_external_project_force_install(PACKAGE libjpeg-turbo STEP_NAMES install fixup-install)
-else()
-  # We need some special Apple treatment
-  if(APPLE)
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(_libjpeg-turbo_ARGS_APPLE --host x86_64-apple-darwin )
-    endif()
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      # Need to investigate/apply the following command-line options for 32-bit when required.
-      # Configure commandline comes from the BUILDING.txt file in libjpeg-turbo source
-      # "--host i686-apple-darwin CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk
-      # -mmacosx-version-min=10.5 -O3 -m32' LDFLAGS='-isysroot
-      # /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -m32'")
-
-    endif()
-  endif()
-
-  Fletch_Require_Make()
-  ExternalProject_Add(libjpeg-turbo
-    URL ${libjpeg-turbo_url}
-    URL_MD5 ${libjpeg-turbo_md5}
-    DEPENDS ${libjpeg-turbo_DEPENDS}
-    ${COMMON_EP_ARGS}
-    PATCH_COMMAND ${CMAKE_COMMAND}
-        -Dlibjpeg-turbo_patch:PATH=${fletch_SOURCE_DIR}/Patches/libjpeg-turbo
-        -Dlibjpeg-turbo_source:PATH=${fletch_BUILD_PREFIX}/src/libjpeg-turbo
-        -P ${fletch_SOURCE_DIR}/Patches/libjpeg-turbo/Patch.cmake
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ./configure
-      --prefix=${fletch_BUILD_INSTALL_PREFIX}
-      ${_libjpeg-turbo_ARGS_APPLE}
-      NASM=${fletch_YASM}
-    BUILD_COMMAND ${MAKE_EXECUTABLE}
-    INSTALL_COMMAND ${MAKE_EXECUTABLE} install
-  )
-  fletch_external_project_force_install(PACKAGE libjpeg-turbo)
 endif()
 
+fletch_external_project_force_install(PACKAGE libjpeg-turbo STEP_NAMES install fixup-install)
+
 set(libjpeg-turbo_ROOT "${fletch_BUILD_INSTALL_PREFIX}" CACHE PATH "" FORCE)
 file(APPEND ${fletch_CONFIG_INPUT} "
 ################################

CMake/fletch-tarballs.cmake

@@ -49,9 +49,9 @@ set(zlib_dlname "zlib-${ZLib_version}.zip")
 list(APPEND fletch_external_sources ZLib)
 
 # libjpeg-turbo
-set(libjpeg-turbo_version "1.4.0")
+set(libjpeg-turbo_version "2.0.5")
 set(libjpeg-turbo_url "http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${libjpeg-turbo_version}.tar.gz")
-set(libjpeg-turbo_md5 "039153dabe61e1ac8d9323b5522b56b0")
+set(libjpeg-turbo_md5 "3a7dc293918775fc933f81e2bce36464")
 list(APPEND fletch_external_sources libjpeg-turbo)
 
 # libtiff

Patches/libjpeg-turbo/Patch.cmake

@@ -6,15 +6,15 @@
 # The purpose of this is to add CMake build to libsvm
 message("Patching libjpeg-turbo ${libjpeg-turbo_patch} AND ${libjpeg-turbo_source}")
 
-if (WIN32)
-  file(COPY
-    ${libjpeg-turbo_patch}/simd/CMakeLists.txt
-    DESTINATION ${libjpeg-turbo_source}/simd/
-    )
-endif()
+#if (WIN32 )
+#   file(COPY
+#     ${libjpeg-turbo_patch}/simd/CMakeLists.txt
+#     DESTINATION ${libjpeg-turbo_source}/simd/
+#     )
+# endif()
 
-# Patch config.guess for arm boards.
-file(COPY
-  ${libjpeg-turbo_patch}/config.guess
-  DESTINATION ${libjpeg-turbo_source}/
-  )
+# # Patch config.guess for arm boards.
+# file(COPY
+#   ${libjpeg-turbo_patch}/config.guess
+#   DESTINATION ${libjpeg-turbo_source}/
+#   )