diff --git a/README.md b/README.md index 331d042..aa15a32 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # libgeotiff +A TIFF based interchange format for georeferenced raster imagery. + diff --git a/libgeotiff-1.7.1-proj-9.4.0-1.patch b/libgeotiff-1.7.1-proj-9.4.0-1.patch new file mode 100644 index 0000000..7106a00 --- /dev/null +++ b/libgeotiff-1.7.1-proj-9.4.0-1.patch @@ -0,0 +1,49 @@ +From f4b2b195c2d1901d25c91fb0af018034f7932a71 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 26 Nov 2022 13:23:12 +0100 +Subject: [PATCH] listgeo: add a -no_corners option to avoid printing corner + coordinates which might be PROJ version sensitive (refs #81) + +--- + libgeotiff/bin/listgeo.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libgeotiff/bin/listgeo.c b/libgeotiff/bin/listgeo.c +index 06c45f70..acad54c6 100644 +--- a/libgeotiff/bin/listgeo.c ++++ b/libgeotiff/bin/listgeo.c +@@ -29,6 +29,7 @@ void Usage() + " -tfw: Generate a .tfw (ESRI TIFF World) file for the target file.\n" + " -proj4: Report PROJ.4 equivalent projection definition.\n" + " -no_norm: Don't report 'normalized' parameter values.\n" ++ " -no_corners: Don't report corner coordinates.\n" + " filename: Name of the GeoTIFF file to report on.\n" ); + + exit( 1 ); +@@ -42,6 +43,7 @@ int main(int argc, char *argv[]) + int i, norm_print_flag = 1, proj4_print_flag = 0; + int tfw_flag = 0, inv_flag = 0, dec_flag = 0; + int st_test_flag = 0; ++ int corners = 1; + + /* + * Handle command line options. +@@ -50,6 +52,8 @@ int main(int argc, char *argv[]) + { + if( strcmp(argv[i],"-no_norm") == 0 ) + norm_print_flag = 0; ++ else if( strcmp(argv[i],"-no_corners") == 0 ) ++ corners = 0; + else if( strcmp(argv[i],"-tfw") == 0 ) + tfw_flag = 1; + else if( strcmp(argv[i],"-proj4") == 0 ) +@@ -130,7 +134,8 @@ int main(int argc, char *argv[]) + + TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &xsize ); + TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &ysize ); +- GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag ); ++ if( corners ) ++ GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag ); + } + + } diff --git a/libgeotiff-1.7.1-proj-9.4.0-2.patch b/libgeotiff-1.7.1-proj-9.4.0-2.patch new file mode 100644 index 0000000..41b2bf2 --- /dev/null +++ b/libgeotiff-1.7.1-proj-9.4.0-2.patch @@ -0,0 +1,62 @@ +From 468e2a178fa2c72ac7ae4a226abb76ac047e3774 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 26 Nov 2022 13:24:02 +0100 +Subject: [PATCH] testlistgeo: do not print corner coordinates for data files + with Cassini Soldner projection, whose formulas have changed in PROJ 9.1.1 + (fixes #81) + +--- + libgeotiff/test/testlistgeo | 4 ++-- + libgeotiff/test/testlistgeo_out.dist | 14 -------------- + 2 files changed, 2 insertions(+), 16 deletions(-) + +diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo +index 596301b4..9a41e74f 100755 +--- a/libgeotiff/test/testlistgeo ++++ b/libgeotiff/test/testlistgeo +@@ -59,11 +59,11 @@ $EXE ${DATA_DIR}/ProjLinearUnitsGeoKey_9036.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo ProjectedCSTypeGeoKey_28191_cassini_soldner.tif" >> ${OUT} +-$EXE ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT} ++$EXE -no_corners ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo cassini_soldner.tif" >> ${OUT} +-$EXE ${DATA_DIR}/cassini_soldner.tif >>${OUT} ++$EXE -no_corners ${DATA_DIR}/cassini_soldner.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif" >> ${OUT} +diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist +index 742f0fce..20221cec 100644 +--- a/libgeotiff/test/testlistgeo_out.dist ++++ b/libgeotiff/test/testlistgeo_out.dist +@@ -299,13 +299,6 @@ Ellipsoid: 7010/Clarke 1880 (Benoit) (6378300.79,6356566.43) + Prime Meridian: 8901/Greenwich (0.000000/ 0d 0' 0.00"E) + Projection Linear Units: 9001/metre (1.000000m) + +-Corner Coordinates: +-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N) +-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N) +-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N) +-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N) +-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N) +- + Testing listgeo cassini_soldner.tif + Geotiff_Information: + Version: 1 +@@ -348,13 +341,6 @@ Projection Method: CT_CassiniSoldner + ProjFalseNorthingGeoKey: 126867.909000 m + Projection Linear Units: 9001/metre (1.000000m) + +-Corner Coordinates: +-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N) +-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N) +-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N) +-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N) +-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N) +- + Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif + Geotiff_Information: + Version: 1 diff --git a/libgeotiff.spec b/libgeotiff.spec new file mode 100644 index 0000000..0289b0d --- /dev/null +++ b/libgeotiff.spec @@ -0,0 +1,97 @@ +Name: libgeotiff +Version: 1.7.1 +Release: 1mamba +Summary: A TIFF based interchange format for georeferenced raster imagery +Group: System/Libraries +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: https://github.com/OSGeo/libgeotiff +Source: https://github.com/OSGeo/libgeotiff.git/%{version}/libgeotiff-%{version}.tar.bz2 +Patch0: libgeotiff-1.7.1-proj-9.4.0-1.patch +Patch1: libgeotiff-1.7.1-proj-9.4.0-2.patch +License: MIT +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libjpeg-devel +BuildRequires: libproj-devel +BuildRequires: libtiff-devel +BuildRequires: libz-devel +## AUTOBUILDREQ-END + +%description +A TIFF based interchange format for georeferenced raster imagery. + +%package devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description devel +This package contains libraries and header files for developing applications that use %{name}. + +%package tools +Group: Applications/Graphics +Summary: Utility applications for %{name} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description tools +This package contains utility applications for %{name}. + +%debug_package + +%prep +%setup -q +%patch 0 -p1 -b .proj-9.4.0-1 +%patch 1 -p1 -b .proj-9.4.0-2 + +cd libgeotiff +./autogen.sh + +%build +cd libgeotiff +%configure \ + --with-jpeg=yes \ + --with-zlib=yes + +%make + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +cd libgeotiff +%makeinstall + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%{_libdir}/libgeotiff.so.* +%doc libgeotiff/LICENSE + +%files devel +%defattr(-,root,root) +%{_includedir}/cpl_serv.h +%{_includedir}/epsg_*.inc +%{_includedir}/geo*.inc +%{_includedir}/geo*.h +%{_includedir}/xtiffio.h +%{_libdir}/libgeotiff.a +%{_libdir}/libgeotiff.so +%doc README.md + +%files tools +%defattr(-,root,root) +%{_bindir}/applygeo +%{_bindir}/geotifcp +%{_bindir}/listgeo +%{_mandir}/man1/applygeo.1* +%{_mandir}/man1/geotifcp.1* +%{_mandir}/man1/listgeo.1* + +%changelog +* Mon May 06 2024 Silvan Calarco 1.7.1-1mamba +- package created using the webbuild interface