packages: gdal/gdal-asneeded.patch, gdal/gdal-perl.patch, gdal/gdal.spec, g...

qboosh qboosh at pld-linux.org
Mon Jan 16 20:49:32 CET 2012 

Author: qboosh                       Date: Mon Jan 16 19:49:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged 1.8.0 from DEVEL (libtiff 4 required)
- added libpng patch to fix build with libpng 1.5.x

---- Files affected:
packages/gdal:
   gdal-asneeded.patch (1.2 -> 1.3) , gdal-perl.patch (1.3 -> 1.4) , gdal.spec (1.94 -> 1.95) , gdal-libpng.patch (NONE -> 1.1)  (NEW), gdal-libdap.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/gdal/gdal-asneeded.patch
diff -u packages/gdal/gdal-asneeded.patch:1.2 packages/gdal/gdal-asneeded.patch:1.3
--- packages/gdal/gdal-asneeded.patch:1.2	Wed Jun 11 19:12:10 2008
+++ packages/gdal/gdal-asneeded.patch	Mon Jan 16 20:49:26 2012
@@ -1,5 +1,5 @@
---- gdal-1.5.1/m4/ax_xerces.m4.orig	2007-12-07 01:26:11.000000000 +0100
-+++ gdal-1.5.1/m4/ax_xerces.m4	2008-06-05 22:45:13.942715785 +0200
+--- gdal-1.8.0/m4/ax_lib_xerces.m4.orig	2007-12-07 01:26:11.000000000 +0100
++++ gdal-1.8.0/m4/ax_lib_xerces.m4	2008-06-05 22:45:13.942715785 +0200
 @@ -116,8 +116,8 @@
          saved_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2"

================================================================
Index: packages/gdal/gdal-perl.patch
diff -u packages/gdal/gdal-perl.patch:1.3 packages/gdal/gdal-perl.patch:1.4
--- packages/gdal/gdal-perl.patch:1.3	Wed Jul  8 22:37:59 2009
+++ packages/gdal/gdal-perl.patch	Mon Jan 16 20:49:26 2012
@@ -1,9 +1,11 @@
-diff -Nur gdal-1.6.1.orig/swig/perl/GNUmakefile gdal-1.6.1/swig/perl/GNUmakefile
---- gdal-1.6.1.orig/swig/perl/GNUmakefile	2008-09-13 12:49:45.000000000 +0100
-+++ gdal-1.6.1/swig/perl/GNUmakefile	2009-07-08 21:20:24.000000000 +0100
-@@ -46,4 +46,4 @@
- 	$(MAKE) -f Makefile_Geo__GDAL dist
+--- gdal-1.8.0/swig/perl/GNUmakefile.orig	2011-01-14 06:19:06.000000000 +0100
++++ gdal-1.8.0/swig/perl/GNUmakefile	2011-01-26 17:16:08.978356589 +0100
+@@ -26,7 +26,7 @@
+ gdal_wrap.cc: generate
  
  Makefile_Geo__GDAL:
--	perl Makefile.PL
+-	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
 +	perl Makefile.PL INSTALLDIRS=vendor
+ 
+ test: build
+ 	$(MAKE) -f Makefile_Geo__GDAL test

================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.94 packages/gdal/gdal.spec:1.95
--- packages/gdal/gdal.spec:1.94	Fri Jan 13 15:48:56 2012
+++ packages/gdal/gdal.spec	Mon Jan 16 20:49:26 2012
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
-# TODO: csharp, java, mysql
+# TODO:
+# - wait for newer pcidsk, switch to external again
+# - csharp, java, mysql
 #
 # Conditional build:
 %bcond_without	odbc	# disable odbc support
@@ -9,18 +11,18 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.7.3
-Release:	11
+Version:	1.8.0
+Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	c4673970bd2285032de9ae9bbd82754a
+# Source0-md5:	c762cdab0f7e51a677ba49278a8a263d
 Patch0:		%{name}-perl.patch
 Patch1:		%{name}-ruby.patch
 Patch2:		%{name}-asneeded.patch
 Patch3:		%{name}-python_install.patch
-Patch4:		%{name}-libdap.patch
-Patch5:		%{name}-doxy.patch
+Patch4:		%{name}-doxy.patch
+Patch5:		%{name}-libpng.patch
 URL:		http://www.gdal.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -38,13 +40,13 @@
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 2:1.2.8
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel >= 3.6.0
+BuildRequires:	libtiff-devel >= 4.0
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	netcdf-devel
 BuildRequires:	ogdi-devel >= 3.1
-BuildRequires:	pcidsk-devel
+#BuildRequires:	pcidsk-devel > 0.3
 BuildRequires:	perl-devel
 BuildRequires:	postgresql-backend-devel
 BuildRequires:	postgresql-devel
@@ -70,7 +72,7 @@
 Requires:	geos >= 2.2
 Requires:	libgeotiff >= 1.2.1
 Requires:	libpng >= 2:1.2.8
-Requires:	libtiff >= 3.6.0
+Requires:	libtiff >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -107,10 +109,10 @@
 Requires:	libjpeg-devel
 Requires:	libpng-devel >= 2:1.2.8
 Requires:	libstdc++-devel
-Requires:	libtiff-devel >= 3.6.0
+Requires:	libtiff-devel >= 4.0
 Requires:	netcdf-devel
 Requires:	ogdi-devel >= 3.1
-Requires:	pcidsk-devel
+#Requires:	pcidsk-devel > 0.3
 Requires:	postgresql-devel
 Requires:	sqlite3-devel >= 3
 %{?with_odbc:Requires:	unixODBC-devel}
@@ -198,11 +200,11 @@
 %{__aclocal} -I m4
 %{__autoconf}
 # disable grass/libgrass here, it can be built from separate gdal-grass package
+# note: "WARNING: unrecognized options: --with-hide-internal-symbols" is caused by configure bug; option DOES take effect
 %configure \
 	--datadir=%{_datadir}/gdal \
 	--with-dods-root=/usr \
 	--with-hide-internal-symbols \
-	--with-pcidsk=/usr \
 	--with-perl \
 	--with-python \
 	%{?with_ruby:--with-ruby} \
@@ -212,6 +214,7 @@
 	--with-xerces-lib="-lxerces-c" \
 	--without-grass \
 	--without-libgrass
+#	--with-pcidsk=/usr (needs > 0.3)
 # --with-php needs Zend API update
 # java broken, no configure option
 # csharp builds, but has no configure option
@@ -247,10 +250,8 @@
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OSR/.packlist
 
 # some doxygen trash
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL/Const.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OGR.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OSR.dox
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/{GDAL.dox,GDAL/Const.dox,OGR.dox,OSR.dox}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gdal_{fillnodata,sieve}.dox
 
 %if %{with ruby}
 %{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/gdal/*.la
@@ -272,6 +273,7 @@
 %attr(755,root,root) %{_bindir}/gdal2tiles.py
 %attr(755,root,root) %{_bindir}/gdal2xyz.py
 %attr(755,root,root) %{_bindir}/gdal_contour
+%attr(755,root,root) %{_bindir}/gdal_calc.py
 %attr(755,root,root) %{_bindir}/gdal_fillnodata.py
 %attr(755,root,root) %{_bindir}/gdal_grid
 %attr(755,root,root) %{_bindir}/gdal_merge.py
@@ -289,6 +291,7 @@
 %attr(755,root,root) %{_bindir}/gdalident.py
 %attr(755,root,root) %{_bindir}/gdalimport.py
 %attr(755,root,root) %{_bindir}/gdalinfo
+%attr(755,root,root) %{_bindir}/gdallocationinfo
 %attr(755,root,root) %{_bindir}/gdalmanage
 %attr(755,root,root) %{_bindir}/gdaltindex
 %attr(755,root,root) %{_bindir}/gdaltransform
@@ -318,6 +321,7 @@
 %{_mandir}/man1/gdalbuildvrt.1*
 %{_mandir}/man1/gdaldem.1*
 %{_mandir}/man1/gdalinfo.1*
+%{_mandir}/man1/gdallocationinfo.1*
 %{_mandir}/man1/gdaltindex.1*
 %{_mandir}/man1/gdaltransform.1*
 %{_mandir}/man1/gdalwarp.1*
@@ -405,6 +409,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2012/01/16 19:49:26  qboosh
+- merged 1.8.0 from DEVEL (libtiff 4 required)
+- added libpng patch to fix build with libpng 1.5.x
+
 Revision 1.94  2012/01/13 14:48:56  arekm
 - release 11
 
@@ -431,6 +439,9 @@
 
 Revision 1.86  2011/06/10 12:23:29  lisu
 - rel 4
+
+Revision 1.85.2.1  2011/01/28 17:36:12  qboosh
+- started update to 1.8.0 (uses libtiff 4.0 features)
 
 Revision 1.85  2011/01/22 20:04:06  sparky
 - BR: libuuid-devel, libxml2-devel

================================================================
Index: packages/gdal/gdal-libpng.patch
diff -u /dev/null packages/gdal/gdal-libpng.patch:1.1
--- /dev/null	Mon Jan 16 20:49:32 2012
+++ packages/gdal/gdal-libpng.patch	Mon Jan 16 20:49:26 2012
@@ -0,0 +1,38 @@
+--- gdal-1.8.0/frmts/png/pngdataset.cpp.orig	2011-01-14 06:19:04.000000000 +0100
++++ gdal-1.8.0/frmts/png/pngdataset.cpp	2012-01-16 19:36:37.513649497 +0100
+@@ -1315,7 +1315,7 @@
+     * instead of an int, which is what fread() actually returns.
+     */
+    check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
+-                                 (VSILFILE*)png_ptr->io_ptr);
++                                 (VSILFILE*)png_get_io_ptr(png_ptr));
+ 
+    if (check != length)
+       png_error(png_ptr, "Read Error");
+@@ -1330,7 +1330,7 @@
+ {
+    png_uint_32 check;
+ 
+-   check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
++   check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr));
+ 
+    if (check != length)
+       png_error(png_ptr, "Write Error");
+@@ -1341,7 +1341,7 @@
+ /************************************************************************/
+ static void png_vsi_flush(png_structp png_ptr)
+ {
+-    VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
++    VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) );
+ }
+ 
+ /************************************************************************/
+@@ -1357,7 +1357,7 @@
+     // libpng is generally not built as C++ and so won't honour unwind
+     // semantics.  Ugg. 
+ 
+-    jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
++    jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
+     if (psSetJmpContext)
+     {
+         longjmp( *psSetJmpContext, 1 );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-asneeded.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-perl.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.94&r2=1.95&f=u

More information about the pld-cvs-commit mailing list