#4364 gdal-1.10.1-2

closed-fixed
Kurt Schwehr
None
5
2014-01-17
2013-11-07
Jack Howarth
No

The attached packaging makes the following changes...

--- gdal.info 2013-09-08 11:07:46.000000000 -0400
+++ /sw/fink/10.7/local/main/finkinfo/gdal.info 2013-11-07 15:48:19.000000000 -0500
@@ -10,7 +10,7 @@
Type: pgsql (. -pgsql)
#Type: pgsql (. -pgsql), mysql (. -mysql)
Version: 1.10.1
-Revision: 1
+Revision: 2

Depends: %n-shlibs (= %v-%r)

@@ -22,7 +22,7 @@
#Replaces: gdal, gdal-pgsql, gdal-mysql, gdal-pgsql-mysql

BuildDepends: <<
- libjpeg9, libjasper.1, libpng15, libtiff5,
+ libjpeg9, libjasper.1, libpng16, libtiff5, optipng,
giflib,
szip,
libiconv-dev,
@@ -58,6 +58,8 @@
PatchScript: <<
# Address http://trac.osgeo.org/gdal/ticket/5197
perl -pi.bak -e "s| \&\& !defined(TARGET_OS_IPHONE)||" port/cpl_spawn.cpp
+ # optimize away corruption in png
+ optipng data/gdalicon.png doc/grid/ellipse.png doc/grid/gridding.png doc/images/act-logo.png doc/images/foss4g09.png doc/images/ingres-logo.png doc/images/safe-logo.png doc/images/src-logo.png doc/images/waypoint_logo.png
<<

ConfigureParams: <<
@@ -118,7 +120,7 @@
Replaces: gdal-shlibs, gdal-pgsql-shlibs
#, gdal-mysql-shlibs, gdal-pgsql-mysql-shlibs
Depends: <<
- libjpeg9-shlibs, libjasper.1-shlibs, libpng15-shlibs, libtiff5-shlibs,
+ libjpeg9-shlibs, libjasper.1-shlibs, libpng16-shlibs, libtiff5-shlibs,
giflib-shlibs,
szip-shlibs, libiconv,
netcdf-c7-shlibs,

which switches the Depends/BuildDepends to libpng16-shlibs/libpng16 and regenerates the bundled png files with optipng to purge any potential corruption.

Discussion

  • Jack Howarth
    Jack Howarth
    2013-11-07

    Info file for gdal-1.10.1-2 to unblock build on 10.9 again.

     
    Attachments
  • Jack Howarth
    Jack Howarth
    2013-11-07

    Note that the png.py test suite completely passes if you execute...

    cd autotest/gdrivers
    optipng -nb -nc -np data/test.png

    % ./png.py
    TEST: png_1 ... success
    TEST: png_2 ... success
    TEST: png_3 ... success
    TEST: png_4 ... success
    TEST: png_5 ... success
    TEST: png_6 ... success
    TEST: png_7 ... success
    TEST: png_8 ... success
    TEST: png_9 ... success
    TEST: png_10 ... success
    TEST: png_11 ... success

    Test Script: png
    Succeeded: 11
    Failed: 0 (0 blew exceptions)
    Skipped: 0
    Expected fail:0
    Duration: 0.08s

    for this packaging built against libpng16

     
  • Jack Howarth
    Jack Howarth
    2013-11-08

    Using the newer optipng 0.7.4 release, only the data/gdalicon.png file in the gdal distribution needs to be fixed. Note that the newer opting 0.7.x series doesn't retain the same checksums so repairs should be done using the optipng 0.6.3 in current fink for fixing the autotest/gdrivers/data/test.png file. The checksum issue shouldn't matter for the data/gdalicon.png file.

     
    • Group: Undergoing_Validation --> Awaiting_OK_from_Maintainer
     
  • What is the status of this item?

     
  • Kurt Schwehr
    Kurt Schwehr
    2014-01-17

    • status: open --> closed-fixed
     
  • Kurt Schwehr
    Kurt Schwehr
    2014-01-17

    fixed r1.24 2013/11/18