BUG: fix patches for OpenJPEG 2.2

SuperBuild/patches/GDAL/gdal-fix-rpath-for-macx.diff

 diff -burN gdal-1.11.2.orig/configure gdal-1.11.2/configure
 --- gdal-1.11.2.orig/configure	2016-04-19 12:27:26.000000000 +0200
 +++ gdal-1.11.2/configure	2016-04-19 13:05:25.000000000 +0200
-@@ -10595,9 +10595,9 @@
+@@ -12510,9 +12510,9 @@
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
@@ -13,7 +13,7 @@ diff -burN gdal-1.11.2.orig/configure gdal-1.11.2/configure
      module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
 
    else
-@@ -13542,13 +13542,13 @@
+@@ -15457,13 +15457,13 @@
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all

SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in

@@ -62,7 +62,7 @@ GEOS_LIB     = $(GEOS_DIR)\lib\geos.lib $(GEOS_DIR)\lib\geos_c.lib
 # Uncomment for OpenJpeg support
 HAVE_OPENJPEG = YES
 OPENJPEG_ENABLED = YES
-OPENJPEG_VERSION = 20100
+OPENJPEG_VERSION = 20200
 OPENJPEG_CFLAGS = -I@SB_INSTALL_PREFIX_NATIVE@\include
 OPENJPEG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\openjp2.lib
 

SuperBuild/patches/OPENJPEG/openjpeg-2-fixes-macx.diff

 diff -burN openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/CMakeLists.txt openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/CMakeLists.txt
 --- openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/CMakeLists.txt	2016-07-01 12:37:01.000000000 +0200
 +++ openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/CMakeLists.txt	2016-07-01 12:37:20.000000000 +0200
-@@ -151,7 +151,7 @@
+@@ -153,7 +153,7 @@
  endif()
  
  if (APPLE)
@@ -31,9 +31,12 @@ diff -burN openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/thirdparty/CMa
    find_package(LCMS2)
    if(LCMS2_FOUND)
      message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
-@@ -115,4 +115,4 @@
+@@ -115,7 +115,7 @@
        message(STATUS "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
      endif(LCMS_FOUND)
    endif(LCMS2_FOUND)
 -endif(BUILD_THIRDPARTY)
 +endif()
+ 
+ 
+ #------------