- new upstream one
- catch some more docs - fix ogr python module runtime - include testcases and run tests - enable geotiff external library we have new libgeotiff now - EPSG geodetic database is licensed OK since v6.13 so re-enable - enable it against grass by default, implement optional switches
This commit is contained in:
Balint Cristian
parent
2ee1205a31
commit
5873c967d7
|
|
@ -1 +1,2 @@
|
|||
gdal-1.4.1-fedora.tar.gz
|
||||
gdal-1.4.2-fedora.tar.gz
|
||||
gdalautotest-1.4.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,38 +1,6 @@
|
|||
diff -Nru gdal-1.4.1-fedora/configure gdal-1.4.1-fedora-patched/configure
|
||||
--- gdal-1.4.1-fedora/configure 2007-04-10 17:16:54.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/configure 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -23371,6 +23371,12 @@
|
||||
|
||||
echo "using internal GeoTIFF code."
|
||||
|
||||
+elif test "$with_geotiff" = "disabled" ; then
|
||||
+
|
||||
+ GEOTIFF_SETTING=disabled
|
||||
+
|
||||
+ echo "disabled GeoTIFF code."
|
||||
+
|
||||
else
|
||||
|
||||
GEOTIFF_SETTING=external
|
||||
diff -Nru gdal-1.4.1-fedora/configure.in gdal-1.4.1-fedora-patched/configure.in
|
||||
--- gdal-1.4.1-fedora/configure.in 2007-04-10 17:16:55.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/configure.in 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -612,6 +612,12 @@
|
||||
|
||||
echo "using internal GeoTIFF code."
|
||||
|
||||
+elif test "$with_geotiff" = "disabled" ; then
|
||||
+
|
||||
+ GEOTIFF_SETTING=disabled
|
||||
+
|
||||
+ echo "disabled GeoTIFF code."
|
||||
+
|
||||
else
|
||||
|
||||
GEOTIFF_SETTING=external
|
||||
diff -Nru gdal-1.4.1-fedora/frmts/formats_list.html gdal-1.4.1-fedora-patched/frmts/formats_list.html
|
||||
--- gdal-1.4.1-fedora/frmts/formats_list.html 2007-04-10 17:16:26.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/frmts/formats_list.html 2007-05-09 19:38:52.000000000 +0200
|
||||
diff -Nru gdal-1.4.2-fedora/frmts/formats_list.html gdal-1.4.2-fedora-patched/frmts/formats_list.html
|
||||
--- gdal-1.4.2-fedora/frmts/formats_list.html 2007-06-27 20:47:46.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/frmts/formats_list.html 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -178,13 +178,6 @@
|
||||
</td><td> 2GiB
|
||||
</td></tr>
|
||||
|
|
@ -74,9 +42,9 @@ diff -Nru gdal-1.4.1-fedora/frmts/formats_list.html gdal-1.4.1-fedora-patched/fr
|
|||
$Id: formats_list.html 10200 2006-11-02 02:40:47Z fwarmerdam $
|
||||
</p>
|
||||
|
||||
diff -Nru gdal-1.4.1-fedora/frmts/gdalallregister.cpp gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp
|
||||
--- gdal-1.4.1-fedora/frmts/gdalallregister.cpp 2007-04-10 17:16:26.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp 2007-05-09 19:37:21.000000000 +0200
|
||||
diff -Nru gdal-1.4.2-fedora/frmts/gdalallregister.cpp gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp
|
||||
--- gdal-1.4.2-fedora/frmts/gdalallregister.cpp 2007-06-27 20:47:46.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -88,10 +88,6 @@
|
||||
GDALRegister_NITF();
|
||||
#endif
|
||||
|
|
@ -88,33 +56,154 @@ diff -Nru gdal-1.4.1-fedora/frmts/gdalallregister.cpp gdal-1.4.1-fedora-patched/
|
|||
#ifdef FRMT_ceos2
|
||||
GDALRegister_SAR_CEOS();
|
||||
#endif
|
||||
diff -Nru gdal-1.4.1-fedora/frmts/makefile.vc gdal-1.4.1-fedora-patched/frmts/makefile.vc
|
||||
--- gdal-1.4.1-fedora/frmts/makefile.vc 2007-04-10 17:16:26.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/frmts/makefile.vc 2007-05-09 19:37:21.000000000 +0200
|
||||
diff -Nru gdal-1.4.2-fedora/frmts/makefile.vc gdal-1.4.2-fedora-patched/frmts/makefile.vc
|
||||
--- gdal-1.4.2-fedora/frmts/makefile.vc 2007-06-27 20:47:46.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/frmts/makefile.vc 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
GDAL_ROOT = ..
|
||||
|
||||
-EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_hfa -DFRMT_gtiff\
|
||||
+EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas \
|
||||
+EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_gtiff\
|
||||
-DFRMT_sdts -DFRMT_raw -DFRMT_gxf -DFRMT_ceos2 -DFRMT_png \
|
||||
-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
|
||||
-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
|
||||
diff -Nru gdal-1.4.1-fedora/frmts/mrsid/makefile.vc gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc
|
||||
--- gdal-1.4.1-fedora/frmts/mrsid/makefile.vc 2007-04-10 17:16:25.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc 2007-05-09 19:37:21.000000000 +0200
|
||||
diff -Nru gdal-1.4.2-fedora/gcore/gdal_frmts.h gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h
|
||||
--- gdal-1.4.2-fedora/gcore/gdal_frmts.h.orig 2007-07-25 09:44:18.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h 2007-07-25 09:44:28.000000000 +0200
|
||||
@@ -37,7 +37,6 @@
|
||||
void CPL_DLL GDALRegister_GTiff(void);
|
||||
void CPL_DLL GDALRegister_GXF(void);
|
||||
void CPL_DLL GDALRegister_OGDI(void);
|
||||
-void CPL_DLL GDALRegister_HFA(void);
|
||||
void CPL_DLL GDALRegister_AAIGrid(void);
|
||||
void CPL_DLL GDALRegister_AIGrid(void);
|
||||
void CPL_DLL GDALRegister_AIGrid2(void);
|
||||
diff -Nru gdal-1.4.2-fedora/GDALmake.opt.in gdal-1.4.2-fedora-patched/GDALmake.opt.in
|
||||
--- gdal-1.4.2-fedora/GDALmake.opt.in 2007-06-27 20:48:17.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/GDALmake.opt.in 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -312,7 +312,7 @@
|
||||
# and their uppercase form should be the format portion of the
|
||||
# format registration entry point. eg. gdb -> GDALRegister_GDB().
|
||||
#
|
||||
-GDAL_FORMATS = gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm \
|
||||
+GDAL_FORMATS = gxf gtiff aigrid aaigrid ceos ceos2 iso8211 xpm \
|
||||
sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
|
||||
nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi \
|
||||
idrisi \
|
||||
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
|
||||
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-06-27 20:46:10.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -57,9 +57,6 @@
|
||||
#ifdef S57_ENABLED
|
||||
RegisterOGRS57();
|
||||
#endif
|
||||
-#ifdef DGN_ENABLED
|
||||
- RegisterOGRDGN();
|
||||
-#endif
|
||||
#ifdef VRT_ENABLED
|
||||
RegisterOGRVRT();
|
||||
#endif
|
||||
@@ -81,10 +78,6 @@
|
||||
#ifdef KML_ENABLED
|
||||
RegisterOGRKML();
|
||||
#endif
|
||||
-#ifdef ILI_ENABLED
|
||||
- RegisterOGRILI1();
|
||||
- RegisterOGRILI2();
|
||||
-#endif
|
||||
#ifdef SQLITE_ENABLED
|
||||
RegisterOGRSQLite();
|
||||
#endif
|
||||
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
|
||||
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile 2007-06-27 20:46:19.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
OBJ = mrsiddataset.obj
|
||||
|
||||
-EXTRAFLAGS = $(MRSID_INCLUDE) -I..\gtiff\libgeotiff $(MRSID_FLAGS)
|
||||
+EXTRAFLAGS = $(MRSID_INCLUDE) $(MRSID_FLAGS)
|
||||
include ../../GDALmake.opt
|
||||
|
||||
-SUBDIRS-yes := generic shape ntf sdts tiger s57 mitab dgn \
|
||||
+SUBDIRS-yes := generic shape ntf sdts tiger s57 mitab \
|
||||
gml kml avc rec mem vrt csv
|
||||
SUBDIRS-$(HAVE_OGDI) += ogdi
|
||||
SUBDIRS-$(HAVE_OCI) += oci
|
||||
@@ -12,7 +12,6 @@
|
||||
SUBDIRS-$(ODBC_SETTING) += odbc pgeo
|
||||
SUBDIRS-$(HAVE_SQLITE) += sqlite
|
||||
SUBDIRS-$(HAVE_GRASS) += grass
|
||||
-SUBDIRS-$(HAVE_XERCES) += ili
|
||||
SUBDIRS-$(HAVE_DWGDIRECT) += dxfdwg
|
||||
SUBDIRS-$(HAVE_SDE) += sde
|
||||
SUBDIRS-$(HAVE_IDB) += idb
|
||||
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile
|
||||
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile 2007-06-27 20:46:19.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
GDAL_ROOT = ..\..
|
||||
|
||||
diff -Nru gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp
|
||||
--- gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp 2007-04-10 17:16:29.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp 2007-05-09 19:37:21.000000000 +0200
|
||||
-DIRLIST = generic shape ntf sdts tiger s57 dgn mitab gml kml avc \
|
||||
+DIRLIST = generic shape ntf sdts tiger s57 mitab gml kml avc \
|
||||
rec mem vrt csv \
|
||||
$(OGDIDIR) $(FMEDIR) $(OCIDIR) $(PG_DIR) $(DWGDIR) \
|
||||
$(ODBCDIR) $(SQLITE_DIR) $(MYSQL_DIR) $(ILI_DIR) \
|
||||
@@ -53,11 +53,6 @@
|
||||
MYSQL_OBJ = mysql\*.obj
|
||||
!ENDIF
|
||||
|
||||
-!IFDEF ILI_ENABLED
|
||||
-ILI_DIR = ili
|
||||
-ILI_OBJ = ili\*.obj ili\iom\*.obj
|
||||
-!ENDIF
|
||||
-
|
||||
!IFDEF INFORMIXDIR
|
||||
IDB_DIR = idb
|
||||
IDB_OBJ = idb\*.obj
|
||||
@@ -71,7 +66,7 @@
|
||||
|
||||
lib /out:ogrsf_frmts.lib generic\*.obj shape\*.obj ntf\*.obj \
|
||||
sdts\*.obj s57\*.obj tiger\*.obj gml\*.obj \
|
||||
- mitab\*.obj dgn\*.obj avc\*.obj mem\*.obj \
|
||||
+ mitab\*.obj avc\*.obj mem\*.obj \
|
||||
vrt\*.obj csv\*.obj rec\*.obj kml\*.obj \
|
||||
$(OGDIOBJ) $(ODBCOBJ) $(SQLITE_OBJ) \
|
||||
$(FMEOBJ) $(OCIOBJ) $(PG_OBJ) $(MYSQL_OBJ) \
|
||||
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
|
||||
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html 2007-06-27 20:46:18.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -85,11 +85,6 @@
|
||||
</td><td> Yes
|
||||
</td></tr>
|
||||
|
||||
-<tr><td> <a href="drv_dgn.html">Microstation DGN</a>
|
||||
-</td><td> Yes
|
||||
-</td><td> No
|
||||
-</td></tr>
|
||||
-
|
||||
<tr><td> <a href="drv_mysql.html">MySQL</a>
|
||||
</td><td> No
|
||||
</td><td> No
|
||||
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
|
||||
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-06-27 20:46:19.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-07-13 14:22:08.000000000 +0200
|
||||
@@ -310,7 +310,6 @@
|
||||
void CPL_DLL RegisterOGRPG();
|
||||
void CPL_DLL RegisterOGRMySQL();
|
||||
void CPL_DLL RegisterOGROCI();
|
||||
-void CPL_DLL RegisterOGRDGN();
|
||||
void CPL_DLL RegisterOGRGML();
|
||||
void CPL_DLL RegisterOGRKML();
|
||||
void CPL_DLL RegisterOGRAVCBin();
|
||||
@@ -321,8 +320,6 @@
|
||||
void CPL_DLL RegisterOGRDODS();
|
||||
void CPL_DLL RegisterOGRSQLite();
|
||||
void CPL_DLL RegisterOGRCSV();
|
||||
-void CPL_DLL RegisterOGRILI1();
|
||||
-void CPL_DLL RegisterOGRILI2();
|
||||
void CPL_DLL RegisterOGRGRASS();
|
||||
void CPL_DLL RegisterOGRPGeo();
|
||||
void CPL_DLL RegisterOGRDXFDWG();
|
||||
--- gdal-1.4.2-fedora/gcore/gdaldefaultoverviews.cpp.orig 2007-06-27 20:47:49.000000000 +0200
|
||||
+++ gdal-1.4.2-fedora-patched/gcore/gdaldefaultoverviews.cpp 2007-07-25 10:11:26.000000000 +0200
|
||||
@@ -327,31 +327,6 @@
|
||||
/* produce the imagery. */
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
@ -147,240 +236,3 @@ diff -Nru gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp gdal-1.4.1-fedora-pat
|
|||
{
|
||||
if( poODS != NULL )
|
||||
{
|
||||
@@ -359,10 +334,6 @@
|
||||
poODS = NULL;
|
||||
}
|
||||
|
||||
- eErr = GTIFFBuildOverviews( osOvrFilename, nBands, pahBands,
|
||||
- nNewOverviews, panNewOverviewList,
|
||||
- pszResampling, pfnProgress, pProgressData );
|
||||
-
|
||||
if( eErr == CE_None )
|
||||
{
|
||||
poODS = (GDALDataset *) GDALOpen( osOvrFilename, GA_Update );
|
||||
diff -Nru gdal-1.4.1-fedora/gcore/gdal_frmts.h gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h
|
||||
--- gdal-1.4.1-fedora/gcore/gdal_frmts.h 2007-04-10 17:16:29.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -34,10 +34,8 @@
|
||||
|
||||
CPL_C_START
|
||||
void CPL_DLL GDALRegister_GDB(void);
|
||||
-void CPL_DLL GDALRegister_GTiff(void);
|
||||
void CPL_DLL GDALRegister_GXF(void);
|
||||
void CPL_DLL GDALRegister_OGDI(void);
|
||||
-void CPL_DLL GDALRegister_HFA(void);
|
||||
void CPL_DLL GDALRegister_AAIGrid(void);
|
||||
void CPL_DLL GDALRegister_AIGrid(void);
|
||||
void CPL_DLL GDALRegister_AIGrid2(void);
|
||||
diff -Nru gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp
|
||||
--- gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp 2007-04-10 17:16:29.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -45,13 +45,13 @@
|
||||
0xA7,0xAE,0xD6,0x8E,0x34,0x45,0x18,0x09 };
|
||||
|
||||
CPL_C_START
|
||||
-CPLErr CPL_DLL GTIFMemBufFromWkt( const char *pszWKT,
|
||||
+/*CPLErr CPL_DLL GTIFMemBufFromWkt( const char *pszWKT,
|
||||
const double *padfGeoTransform,
|
||||
int nGCPCount, const GDAL_GCP *pasGCPList,
|
||||
int *pnSize, unsigned char **ppabyBuffer );
|
||||
CPLErr CPL_DLL GTIFWktFromMemBuf( int nSize, unsigned char *pabyBuffer,
|
||||
char **ppszWKT, double *padfGeoTransform,
|
||||
- int *pnGCPCount, GDAL_GCP **ppasGCPList );
|
||||
+ int *pnGCPCount, GDAL_GCP **ppasGCPList );*/
|
||||
CPL_C_END
|
||||
|
||||
/************************************************************************/
|
||||
@@ -296,13 +296,13 @@
|
||||
/* -------------------------------------------------------------------- */
|
||||
int bSuccess = TRUE;
|
||||
|
||||
- if( GTIFWktFromMemBuf( nGeoTIFFSize, pabyGeoTIFFData,
|
||||
+/* if( GTIFWktFromMemBuf( nGeoTIFFSize, pabyGeoTIFFData,
|
||||
&pszProjection, adfGeoTransform,
|
||||
&nGCPCount, &pasGCPList ) != CE_None )
|
||||
{
|
||||
bSuccess = FALSE;
|
||||
}
|
||||
-
|
||||
+*/
|
||||
if( pszProjection == NULL || strlen(pszProjection) == 0 )
|
||||
bSuccess = FALSE;
|
||||
|
||||
@@ -724,9 +724,10 @@
|
||||
int nGTBufSize = 0;
|
||||
unsigned char *pabyGTBuf = NULL;
|
||||
|
||||
- if( GTIFMemBufFromWkt( pszProjection, adfGeoTransform,
|
||||
+/* if( GTIFMemBufFromWkt( pszProjection, adfGeoTransform,
|
||||
nGCPCount, pasGCPList,
|
||||
&nGTBufSize, &pabyGTBuf ) != CE_None )
|
||||
+*/
|
||||
return NULL;
|
||||
|
||||
if( nGTBufSize == 0 )
|
||||
diff -Nru gdal-1.4.1-fedora/gcore/gdal_priv.h gdal-1.4.1-fedora-patched/gcore/gdal_priv.h
|
||||
--- gdal-1.4.1-fedora/gcore/gdal_priv.h 2007-04-10 17:16:29.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/gcore/gdal_priv.h 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -612,26 +612,6 @@
|
||||
|
||||
CPL_C_START
|
||||
|
||||
-#ifndef WIN32CE
|
||||
-
|
||||
-CPLErr CPL_DLL
|
||||
-HFAAuxBuildOverviews( const char *pszOvrFilename, GDALDataset *poParentDS,
|
||||
- GDALDataset **ppoDS,
|
||||
- int nBands, int *panBandList,
|
||||
- int nNewOverviews, int *panNewOverviewList,
|
||||
- const char *pszResampling,
|
||||
- GDALProgressFunc pfnProgress,
|
||||
- void *pProgressData );
|
||||
-
|
||||
-#endif /* WIN32CE */
|
||||
-
|
||||
-CPLErr CPL_DLL
|
||||
-GTIFFBuildOverviews( const char * pszFilename,
|
||||
- int nBands, GDALRasterBand **papoBandList,
|
||||
- int nOverviews, int * panOverviewList,
|
||||
- const char * pszResampling,
|
||||
- GDALProgressFunc pfnProgress, void * pProgressData );
|
||||
-
|
||||
CPLErr CPL_DLL
|
||||
GDALDefaultBuildOverviews( GDALDataset *hSrcDS, const char * pszBasename,
|
||||
const char * pszResampling,
|
||||
diff -Nru gdal-1.4.1-fedora/GDALmake.opt.in gdal-1.4.1-fedora-patched/GDALmake.opt.in
|
||||
--- gdal-1.4.1-fedora/GDALmake.opt.in 2007-04-10 17:16:55.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/GDALmake.opt.in 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -311,7 +311,7 @@
|
||||
# and their uppercase form should be the format portion of the
|
||||
# format registration entry point. eg. gdb -> GDALRegister_GDB().
|
||||
#
|
||||
-GDAL_FORMATS = gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm \
|
||||
+GDAL_FORMATS = gxf aigrid aaigrid ceos ceos2 iso8211 xpm \
|
||||
sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
|
||||
nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi \
|
||||
idrisi \
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/Makefile gdal-1.4.1-fedora-patched/ogr/Makefile
|
||||
--- gdal-1.4.1-fedora/ogr/Makefile 2007-04-10 17:15:09.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/Makefile 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
LINKFLAGS = /Zi /MTd
|
||||
EXTRAFLAGS = -I$(MSDASDK)\inc \
|
||||
-I"$(VCDIR)\ATL\Include" -DWIN32 \
|
||||
- -I. -Iogrsf_frmts -I..\frmts\gtiff\libgeotiff \
|
||||
+ -I. -Iogrsf_frmts \
|
||||
$(PROJ_FLAGS) $(PROJ_INCLUDE) $(GEOS_CFLAGS)
|
||||
|
||||
GDAL_ROOT = ..
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
|
||||
--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-04-10 17:14:53.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -57,9 +57,6 @@
|
||||
#ifdef S57_ENABLED
|
||||
RegisterOGRS57();
|
||||
#endif
|
||||
-#ifdef DGN_ENABLED
|
||||
- RegisterOGRDGN();
|
||||
-#endif
|
||||
#ifdef VRT_ENABLED
|
||||
RegisterOGRVRT();
|
||||
#endif
|
||||
@@ -81,10 +78,6 @@
|
||||
#ifdef KML_ENABLED
|
||||
RegisterOGRKML();
|
||||
#endif
|
||||
-#ifdef ILI_ENABLED
|
||||
- RegisterOGRILI1();
|
||||
- RegisterOGRILI2();
|
||||
-#endif
|
||||
#ifdef SQLITE_ENABLED
|
||||
RegisterOGRSQLite();
|
||||
#endif
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
|
||||
--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile 2007-04-10 17:15:02.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
include ../../GDALmake.opt
|
||||
|
||||
-SUBDIRS-yes := generic shape ntf sdts tiger s57 mitab dgn \
|
||||
+SUBDIRS-yes := generic shape ntf sdts tiger s57 mitab \
|
||||
gml kml avc rec mem vrt csv
|
||||
SUBDIRS-$(HAVE_OGDI) += ogdi
|
||||
SUBDIRS-$(HAVE_OCI) += oci
|
||||
@@ -12,7 +12,6 @@
|
||||
SUBDIRS-$(ODBC_SETTING) += odbc pgeo
|
||||
SUBDIRS-$(HAVE_SQLITE) += sqlite
|
||||
SUBDIRS-$(HAVE_GRASS) += grass
|
||||
-SUBDIRS-$(HAVE_XERCES) += ili
|
||||
SUBDIRS-$(HAVE_DWGDIRECT) += dxfdwg
|
||||
SUBDIRS-$(HAVE_SDE) += sde
|
||||
SUBDIRS-$(HAVE_IDB) += idb
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile
|
||||
--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile 2007-04-10 17:15:02.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
GDAL_ROOT = ..\..
|
||||
|
||||
-DIRLIST = generic shape ntf sdts tiger s57 dgn mitab gml kml avc \
|
||||
+DIRLIST = generic shape ntf sdts tiger s57 mitab gml kml avc \
|
||||
rec mem vrt csv \
|
||||
$(OGDIDIR) $(FMEDIR) $(OCIDIR) $(PG_DIR) $(DWGDIR) \
|
||||
$(ODBCDIR) $(SQLITE_DIR) $(MYSQL_DIR) $(ILI_DIR) \
|
||||
@@ -53,11 +53,6 @@
|
||||
MYSQL_OBJ = mysql\*.obj
|
||||
!ENDIF
|
||||
|
||||
-!IFDEF ILI_ENABLED
|
||||
-ILI_DIR = ili
|
||||
-ILI_OBJ = ili\*.obj ili\iom\*.obj
|
||||
-!ENDIF
|
||||
-
|
||||
!IFDEF INFORMIXDIR
|
||||
IDB_DIR = idb
|
||||
IDB_OBJ = idb\*.obj
|
||||
@@ -71,7 +66,7 @@
|
||||
|
||||
lib /out:ogrsf_frmts.lib generic\*.obj shape\*.obj ntf\*.obj \
|
||||
sdts\*.obj s57\*.obj tiger\*.obj gml\*.obj \
|
||||
- mitab\*.obj dgn\*.obj avc\*.obj mem\*.obj \
|
||||
+ mitab\*.obj avc\*.obj mem\*.obj \
|
||||
vrt\*.obj csv\*.obj rec\*.obj kml\*.obj \
|
||||
$(OGDIOBJ) $(ODBCOBJ) $(SQLITE_OBJ) \
|
||||
$(FMEOBJ) $(OCIOBJ) $(PG_OBJ) $(MYSQL_OBJ) \
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
|
||||
--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html 2007-04-10 17:15:02.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -85,11 +85,6 @@
|
||||
</td><td> Yes
|
||||
</td></tr>
|
||||
|
||||
-<tr><td> <a href="drv_dgn.html">Microstation DGN</a>
|
||||
-</td><td> Yes
|
||||
-</td><td> No
|
||||
-</td></tr>
|
||||
-
|
||||
<tr><td> <a href="drv_mysql.html">MySQL</a>
|
||||
</td><td> No
|
||||
</td><td> No
|
||||
diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
|
||||
--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-04-10 17:15:02.000000000 +0200
|
||||
+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-05-09 19:37:21.000000000 +0200
|
||||
@@ -310,7 +310,6 @@
|
||||
void CPL_DLL RegisterOGRPG();
|
||||
void CPL_DLL RegisterOGRMySQL();
|
||||
void CPL_DLL RegisterOGROCI();
|
||||
-void CPL_DLL RegisterOGRDGN();
|
||||
void CPL_DLL RegisterOGRGML();
|
||||
void CPL_DLL RegisterOGRKML();
|
||||
void CPL_DLL RegisterOGRAVCBin();
|
||||
@@ -321,8 +320,6 @@
|
||||
void CPL_DLL RegisterOGRDODS();
|
||||
void CPL_DLL RegisterOGRSQLite();
|
||||
void CPL_DLL RegisterOGRCSV();
|
||||
-void CPL_DLL RegisterOGRILI1();
|
||||
-void CPL_DLL RegisterOGRILI2();
|
||||
void CPL_DLL RegisterOGRGRASS();
|
||||
void CPL_DLL RegisterOGRPGeo();
|
||||
void CPL_DLL RegisterOGRDXFDWG();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -urNad gdal-1.4.1~/pymod/GNUmakefile gdal-1.4.1/pymod/GNUmakefile
|
||||
--- gdal-1.4.1~/pymod/GNUmakefile 2007-04-10 17:15:15.000000000 +0200
|
||||
+++ gdal-1.4.1/pymod/GNUmakefile 2007-04-30 11:58:10.000000000 +0200
|
||||
@@ -27,7 +27,7 @@
|
||||
$(RM) *.o *.$(SO_EXT) *.la
|
||||
|
||||
gdal_wrap.c: gdal.i
|
||||
- -swig -python gdal.i
|
||||
+# -swig -python gdal.i
|
||||
|
||||
$(GDALMODULE_SO): $(OBJ) $(EXE_DEP_LIBS)
|
||||
$(PY_LD_SHARED) $(OBJ) \
|
||||
70
gdal.spec
70
gdal.spec
|
|
@ -1,23 +1,33 @@
|
|||
Name: gdal
|
||||
Version: 1.4.1
|
||||
Release: 4%{?dist}
|
||||
Version: 1.4.2
|
||||
Release: 1%{?dist}
|
||||
Summary: GIS file format library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
URL: http://gdal.maptools.org
|
||||
Source: %{name}-%{version}-fedora.tar.gz
|
||||
Source0: %{name}-%{version}-fedora.tar.gz
|
||||
Source1: http://download.osgeo.org/gdal/gdalautotest-1.4.1.tar.gz
|
||||
Patch0: %{name}-buildfix.patch
|
||||
Patch1: %{name}-swig.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libtool swig pkgconfig
|
||||
BuildRequires: doxygen tetex-latex ghostscript
|
||||
BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
|
||||
BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
|
||||
BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
|
||||
BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel
|
||||
BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
|
||||
BuildRequires: python-devel >= 2.4 xerces-c-devel
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
|
||||
# build against grass by default
|
||||
%define _with_grass 1
|
||||
|
||||
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
|
||||
%define grass_support %{?_with_grass:1}%{!?_with_grass:%{?_without_grass:0}%{!?_without_grass:%{?_grass_support:%{_grass}}%{!?_grass:0}}}
|
||||
|
||||
%if %{grass_support}
|
||||
BuildRequires: grass-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
The GDAL library provides support to handle multiple GIS file formats.
|
||||
|
|
@ -26,6 +36,7 @@ The GDAL library provides support to handle multiple GIS file formats.
|
|||
Summary: Development Libraries for the GDAL file format library
|
||||
Group: Development/Libraries
|
||||
Requires: pkgconfig
|
||||
Requires: libgeotiff-devel
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -50,6 +61,10 @@ The GDAL perl modules provides support to handle multiple GIS file formats.
|
|||
%prep
|
||||
%setup -q -n %{name}-%{version}-fedora
|
||||
%patch0 -p1 -b .buildfix
|
||||
%patch1 -p1 -b .swig
|
||||
|
||||
# unpack test cases olso.
|
||||
tar -xzf %{SOURCE1} .
|
||||
|
||||
# fix wrongly encoded files from tarball
|
||||
set +x
|
||||
|
|
@ -90,6 +105,7 @@ sed -i 's|-L\$with_ogdi -L\$with_ogdi\/lib -logdi|-logdi|g' configure
|
|||
sed -i 's|-L\$with_jpeg -L\$with_jpeg\/lib -ljpeg|-ljpeg|g' configure
|
||||
sed -i 's|-L\$with_libtiff\/lib -ltiff|-ltiff|g' configure
|
||||
sed -i 's|-L\$with_grass\/lib||g' configure
|
||||
sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' configure
|
||||
sed -i 's|-logdi31|-logdi|g' configure
|
||||
|
||||
# fix python path for ppc64
|
||||
|
|
@ -99,6 +115,7 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"\/usr\/lib64\"|g' con
|
|||
export CPPFLAGS="`pkg-config ogdi --cflags`"
|
||||
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/netcdf-3"
|
||||
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/hdf"
|
||||
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
|
||||
export CPPFLAGS="$CPPFLAGS `dap-config --cflags`"
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
|
|
@ -111,7 +128,7 @@ export LDFLAGS='-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf'
|
|||
--with-dods-root=%{_libdir} \
|
||||
--with-ogdi=`ogdi-config --libdir` \
|
||||
--with-cfitsio=%{_prefix} \
|
||||
--with-geotiff=disabled \
|
||||
--with-geotiff=external \
|
||||
--with-tiff=external \
|
||||
--with-libtiff=external \
|
||||
--with-libz \
|
||||
|
|
@ -134,9 +151,11 @@ export LDFLAGS='-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf'
|
|||
--with-xerces-inc=%{_includedir} \
|
||||
--without-pcraster \
|
||||
--enable-shared \
|
||||
%if %{grass_support}
|
||||
--with-libgrass \
|
||||
--with-grass=%{_prefix} \
|
||||
--disable-static
|
||||
# --with-libgrass \
|
||||
# --with-grass=%{_prefix} \
|
||||
%endif
|
||||
|
||||
# fixup hardcoded wrong compile flags.
|
||||
cp GDALmake.opt GDALmake.opt.orig
|
||||
|
|
@ -214,7 +233,7 @@ mkdir -p doc/frmts; find frmts -name "*.html" -exec install -m 644 '{}' doc/frmt
|
|||
mkdir -p doc/ogrsf_frmts; find ogr/ogrsf_frmts -name "*.html" -exec install -m 644 '{}' doc/ogrsf_frmts \;
|
||||
|
||||
# some commented out are broken for now
|
||||
#pushd doc; doxygen index.dox; popd
|
||||
pushd doc; doxygen *.dox; popd
|
||||
pushd rfc; doxygen *.dox; popd
|
||||
pushd rfc/latex; make refman.pdf; popd
|
||||
#pushd ogr/ogrsf_frmts; doxygen *.dox; popd
|
||||
|
|
@ -224,9 +243,33 @@ pushd swig/perl/latex; make refman.pdf; popd
|
|||
|
||||
# cleanup junks
|
||||
for junk in {*.a,*.la,*.bs,.exists,.packlist,.cvsignore} ; do
|
||||
find ${RPM_BUILD_ROOT} -name "$junk" -exec rm -rf '{}' \;
|
||||
find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
|
||||
done
|
||||
|
||||
%check
|
||||
|
||||
pushd gdalautotest-1.4.1
|
||||
|
||||
# export test enviroment
|
||||
export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
|
||||
export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
|
||||
|
||||
# remove some testcases for now due to build failure
|
||||
rm -rf ogr/ogr_pg.py # no pgsql during test (disabled)
|
||||
rm -rf ogr/ogr_dods.py # no dots during test (disabled)
|
||||
rm -rf gdrivers/dods.py # no dots during test (disabled)
|
||||
rm -rf gcore/hfa_write.py # HFA driver absent (disabled)
|
||||
rm -rf ogr/ogr_dgn.py # DGW driver absent (disabled)
|
||||
rm -rf osr/osr_esri.py # ESRI datum absent (disabled)
|
||||
|
||||
rm -rf gcore/tiff_write.py # crash ugly on 64bit (mustfix)
|
||||
|
||||
# run tests but force than normal exit
|
||||
./run_all.py || exit 0
|
||||
|
||||
popd
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
|
@ -289,6 +332,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{perl_vendorarch}/*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 24 2007 Balint Cristian <cbalint@redhat.com> 1.4.2-1
|
||||
- new upstream one
|
||||
- catch some more docs
|
||||
- fix ogr python module runtime
|
||||
- include testcases and run tests
|
||||
- enable geotiff external library we have new libgeotiff now
|
||||
- EPSG geodetic database is licensed OK since v6.13 so re-enable
|
||||
- enable it against grass by default, implement optional switches
|
||||
|
||||
* Tue Jun 05 2007 Balint Cristian <cbalint@redhat.com> 1.4.1-4
|
||||
- re-build.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue