diff --git a/SuperBuild/patches/JPEG/jconfigint.h.in b/SuperBuild/patches/JPEG/jconfigint.h.in old mode 100755 new mode 100644 diff --git a/SuperBuild/patches/JPEG/jpeg-1-fixes-linux.diff b/SuperBuild/patches/JPEG/jpeg-1-fixes-all.diff similarity index 100% rename from SuperBuild/patches/JPEG/jpeg-1-fixes-linux.diff rename to SuperBuild/patches/JPEG/jpeg-1-fixes-all.diff diff --git a/SuperBuild/patches/JPEG/jpeg-1-fixes-macx.diff b/SuperBuild/patches/JPEG/jpeg-1-fixes-macx.diff deleted file mode 100644 index 4650ce803146c5f5fc5657342245b269a939fe9c..0000000000000000000000000000000000000000 --- a/SuperBuild/patches/JPEG/jpeg-1-fixes-macx.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -burN libjpeg-turbo-1.4.1.orig/CMakeLists.txt libjpeg-turbo-1.4.1/CMakeLists.txt ---- libjpeg-turbo-1.4.1.orig/CMakeLists.txt 2016-05-19 08:20:33.000000000 +0200 -+++ libjpeg-turbo-1.4.1/CMakeLists.txt 2016-05-19 09:24:28.000000000 +0200 -@@ -167,6 +167,11 @@ - - message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}") - -+ -+include(CheckTypeSize) -+check_type_size("size_t" JPEG_SIZEOF_SIZE_T) -+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -DSIZEOF_SIZE_T=${JPEG_SIZEOF_SIZE_T}) -+ - configure_file(win/jconfig.h.in jconfig.h) - configure_file(win/jconfigint.h.in jconfigint.h) - -@@ -287,9 +292,9 @@ - endif() - - if(WITH_12BIT) -- set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE") -+ set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED") - else() -- set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE") -+ set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED") - set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c) - set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) - endif() -diff -burN libjpeg-turbo-1.4.1.orig/win/jconfig.h.in libjpeg-turbo-1.4.1/win/jconfig.h.in ---- libjpeg-turbo-1.4.1.orig/win/jconfig.h.in 2016-05-19 08:20:33.000000000 +0200 -+++ libjpeg-turbo-1.4.1/win/jconfig.h.in 2016-05-19 09:26:12.000000000 +0200 -@@ -48,3 +48,5 @@ - #undef RIGHT_SHIFT_IS_UNSIGNED - - #endif /* JPEG_INTERNALS */ -+ -+#undef USE_SETMODE diff --git a/SuperBuild/patches/OPENCV/opencv-fix-rpath-for-macx.diff b/SuperBuild/patches/OPENCV/opencv-fix-rpath-for-macx.diff old mode 100755 new mode 100644 diff --git a/SuperBuild/patches/OSSIM/ossim-2-rpathfix-macx.diff b/SuperBuild/patches/OSSIM/ossim-2-rpathfix-macx.diff old mode 100755 new mode 100644 diff --git a/SuperBuild/patches/PROJ/proj-fix-rpath-for-macx.diff b/SuperBuild/patches/PROJ/proj-fix-rpath-for-macx.diff old mode 100755 new mode 100644