DELTA 365616 0 402 SVN&P+J YM)OPENJPEG OPENJPEG_CONFIGURE_OFF= --with-openjpeg=no OPENJPEG_CONFIGURE_ON= --with-openjpeg=${LOCALBASE} OPENJPEG_LIB_DEPENDS= libopenjp2.so:${PORTSDIR}/graphics/openjpegENDREP DELTA SVN-/----- GDALmake.opt.in.orig 2014-04-17 04:04:49.000000000 +0800 +++ GDALmake.opt.in 2014-08-22 15:05:34.068301293 +0800 @@ -192,6 +192,7 @@ # JPEG-2000 Support via OpenJPEG library. # HAVE_OPENJPEG = @HAVE_OPENJPEG@ +OPENJPEG_VERSION = @OPENJPEG_VERSION@ # # MrSID support via LizardTech's DSDK ENDREP DELTA SVNe#eex^VmO8|`MB+[RU"]݇,M4B eE.$gƏgόDԟ-cnD?2-l6.2bvLS!rnY8f0;i;9 hWחt8oEf#R!{ƾۻdwڿoը}Of-2F |k")PEzxx T=<|XXj6?'C=\Bge4)č+uPzR:w~tq4 o Zp bZH1 .O˧lU!7 9)ۂIVgؓ+?إ&h(WNmVH0>/:] #=KH, fx9ӄ Lpe F΄'C\2C?R,CCP?l0 NN% bMwn-A})CnVUE0d+)1+(K#H8DA4d P'[7>ɘDZr` tqXđjAD#E@(6XK8Fp0gޙp< X!v)0F}q`-/`l9hfh?-*G"X&^}Ap]%LJS }Κ3ĴgطRHoYCRG+y~N2;Φ()R$PC 56Ea/;T3.g6mg+o,b`킶._e2hL,͔^p֧P嵔bÒ-op)S G۩c~+Q^&25׬\ve+3viK÷VTa'7@qw644T&Z^#$ַ%LRT+}qV#[]I[V{Wn~p~7ir ϹLENDREP DELTA SVNfhff--- frmts/openjpeg/GNUmakefile.orig 2014-04-17 04:04:48.000000000 +0800 +++ frmts/openjpeg/GNUmakefile 2014-08-22 15:05:34.071310422 +0800 @@ -5,6 +5,10 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) +ifneq ($(OPENJPEG_VERSION),) +CPPFLAGS := $(CPPFLAGS) -DOPENJPEG_VERSION=$(OPENJPEG_VERSION) +endif + default: $(OBJ:.o=.$(OBJ_EXT)) clean: ENDREP DELTA SVN0200--- frmts/openjpeg/makefile.vc.orig 2014-04-17 04:04:48.000000000 +0800 +++ frmts/openjpeg/makefile.vc 2014-08-22 15:05:34.090310184 +0800 @@ -5,7 +5,11 @@ !INCLUDE $(GDAL_ROOT)\nmake.opt -EXTRAFLAGS = $(OPENJPEG_CFLAGS) +EXTRAFLAGS = $(OPENJPEG_CFLAGS) $(OPENJPEG_VERSION_CFLAGS) + +!IFDEF OPENJPEG_VERSION +OPENJPEG_VERSION_CFLAGS = -DOPENJPEG_VERSION=$(OPENJPEG_VERSION) +!ENDIF default: $(OBJ) xcopy /D /Y *.obj ..\o ENDREP DELTA SVNEEEx^S]o0}⮕h+BBJ Bbf}蟯*6!eIJ9ز,͔c