configure: Support for libpng-config by HuidaeCho · Pull Request #2679 · OSGeo/grass

HuidaeCho · 2022-12-02T17:44:06Z

This PR is needed to use the OSGeo4W version of libpng, not the MSYS2 version.

Usage:

OSGEO4W_ROOT_MSYS=/c/OSGeo4W \
./configure \
--libpng-config=mswindows/osgeo4w/libpng-config

The included libpng-config is version-agnostic as long as ${OSGEO4W_ROOT_MSYS}/include/libpng${PNG_DLL_VERSION}/png.h exists.

…Geo4W v2

HuidaeCho · 2022-12-02T17:57:06Z

Maybe, adding support for libpng-config and creating mswindows/osgeo4w/libpng-config would be better...

…eo4W

…ng version

HuidaeCho · 2022-12-03T18:00:45Z

BTW, is libpng-config included in most Linux distributions and macOS? Safe to remove --with-png-(includes|libs)?

HuidaeCho · 2022-12-04T05:09:10Z

HAVE_PNG_H is not defined for Ubuntu gcc?
https://github.com/OSGeo/grass/actions/runs/3610010032/jobs/6083548001#step:10:160

ERROR: write_image: unknown file type: .png

from

grass/lib/pngdriver/write.c

Lines 39 to 44 in e8f26dd

    
           #ifdef HAVE_PNG_H 
        
               else if (G_strcasecmp(p, ".png") == 0) 
        
                   write_png(); 
        
           #endif 
        
               else 
        
                   G_fatal_error("write_image: unknown file type: %s", p);

HuidaeCho · 2022-12-04T05:31:03Z

libpng-config from Ubuntu 20.04 seems to be broken. It doesn't print an -L flag for --ldflags.

...
libs="-lpng16"
...
L_opts=
R_opts=
...
ldopts=""
...
    --ldflags)
        echo ${ldopts} ${L_opts} ${R_opts} {$libs}

nilason

You need to change HAVE_PNG_H to HAVE_PNG in the files:

grass/lib/pngdriver/read.c

Line 33 in e8f26dd

#ifdef HAVE_PNG_H

grass/lib/pngdriver/write.c

Line 39 in e8f26dd

#ifdef HAVE_PNG_H

And then it works for me.

There is one difference to PNGLIB compared to before:

was -L/opt/local/lib -lpng -lz
with this: -L/opt/local/lib -lpng16

there is a missing -lz flag. I'm not sure of the importance or consequence of this.

configure.ac

nilason · 2022-12-06T09:32:12Z

HAVE_PNG_H is not defined for Ubuntu gcc?

HAVE_PNG_H was defined before with: LOC_CHECK_INCLUDES(png.h,PNG,$PNGINC), but not with this PR. HAVE_PNG serves the same purpose.

configure

HuidaeCho · 2022-12-06T14:48:25Z

there is a missing -lz flag. I'm not sure of the importance or consequence of this.

Not sure either, but if -lz is missing from the system libpng-config, maybe harmless.

Changing HAVE_PNG to HAVE_PNG_H is more consistent with other *_H and safer (previously it was HAVE_PNG_H)

nilason · 2022-12-06T16:38:17Z

there is a missing -lz flag. I'm not sure of the importance or consequence of this.

Not sure either, but if -lz is missing from the system libpng-config, maybe harmless.

Well, it is there. Using libpng-config --static --ldflags I get -L/opt/local/lib -lpng16 -lz.

it comes from:
all_libs="-lpng16 -lz "
originating from libpng source file libpng-config.in:
all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"

$ZLIB="-lz" and $MATHLIB="" (on my system) was previously set as mandatory (and added) by autoconf with:
LOC_CHECK_LIBS(png,png_read_image,PNG,$PNGLIB,PNGLIB,,$ZLIB $MATHLIB,)
see:

grass/aclocal.m4

Lines 145 to 159 in e8f26dd

    
           dnl $1  = library 
        
           dnl $2  = function 
        
           dnl $3  = descriptive name 
        
           dnl $4  = LDFLAGS initialiser 
        
           dnl $5  = result variable 
        
           dnl $6  = mandatory dependencies (not added to $5) 
        
           dnl $7  = mandatory dependencies (added to $5) 
        
           dnl $8  = ACTION-IF-NOT-FOUND 
        
           dnl $9+ = optional dependencies 
        
           define(LOC_CHECK_LIBS_0,[ 
        
           AC_CHECK_LIB($1, $2, $5="$$5 -l$1 $7",[ 
        
           [$8] 
        
           ],$6 $7) 
        
           ])

Maybe libpng-config --static --ldflags could be used instead of libpng-config --ldflags?

Re: HAVE_PNG vs HAVE_PNG_H. There is already a bunch of similar to the former one with e.g. HAVE_OGR, HAVE_GDAL, HAVE_PDAL. But no big issue, works either way.

HuidaeCho · 2022-12-06T17:22:00Z

libpng-config --static --ldflags

That's interesting.. Only --static --ldflags includes -lm -lz. This is my output from Slackware:

-L/usr/lib64 -lpng16 -lm -lz -lm

ldd /usr/lib64/libpng16.so actually produces

        linux-vdso.so.1 (0x00007fff14bd0000)
        libz.so.1 => /lib64/libz.so.1 (0x00007f4860828000)
        libm.so.6 => /lib64/libm.so.6 (0x00007f48606e0000)
        libc.so.6 => /lib64/libc.so.6 (0x00007f4860501000)
        /lib64/ld-linux-x86-64.so.2 (0x00007f48608ae000)

including libz.so.1 and libm.so.6, so I guess libpng-config --static --ldflags would be safer although we're not really doing "static linking".

nilason · 2022-12-06T17:30:22Z

so I guess libpng-config --static --ldflags would be safer although we're not really doing "static linking".

Indeed, that seems to be the safest way not to introduce regression.

nilason

Looks good to me!

Last minute changes to configure.ac with OSGeo#2679 never was generated to configure.

Last minute changes to configure.ac with commit 8efd228 (#2679) was never generated to configure.

* configure: PNGVER environment variable to pickup libpng16.dll from OSGeo4W v2 * Add libpng-config (part of libpng) support and missing script for OSGeo4W * Add --dll-version to libpng-config; Update gdal-config to detect libpng version * Add --libpng-config to build_centos.sh * Fix for clang (no implicit declaration of function) * Use libpng-config --ldflags instead of --libs to include -L flags * Let's try LDFLAGS for Ubuntu 20.04 * Define HAVE_PNG_H * Consistent comments * Delete trailing spaces; Replace tabs+spaces+tabs with tabs+spaces * Copyright year to 2022 * Revert build_ubuntu-20.04.sh * Add --static flag to libpng-config to include -lm -lz Co-authored-by: Huidae Cho <[email protected]>

Last minute changes to configure.ac with commit 8efd228 (OSGeo#2679) was never generated to configure.

* configure: PNGVER environment variable to pickup libpng16.dll from OSGeo4W v2 * Add libpng-config (part of libpng) support and missing script for OSGeo4W * Add --dll-version to libpng-config; Update gdal-config to detect libpng version * Add --libpng-config to build_centos.sh * Fix for clang (no implicit declaration of function) * Use libpng-config --ldflags instead of --libs to include -L flags * Let's try LDFLAGS for Ubuntu 20.04 * Define HAVE_PNG_H * Consistent comments * Delete trailing spaces; Replace tabs+spaces+tabs with tabs+spaces * Copyright year to 2022 * Revert build_ubuntu-20.04.sh * Add --static flag to libpng-config to include -lm -lz Co-authored-by: Huidae Cho <[email protected]>

Last minute changes to configure.ac with commit 8efd228 (OSGeo#2679) was never generated to configure.

configure: PNGVER environment variable to pickup libpng16.dll from OS…

93d73c2

…Geo4W v2

HuidaeCho added the windows Microsoft Windows specific label Dec 2, 2022

HuidaeCho changed the title ~~configure: PNGVER environment variable to pickup libpng16.dll from OSGeo4W v2~~ configure: PNGVER environment variable to pick up libpng16.dll from OSGeo4W v2 Dec 2, 2022

HuidaeCho changed the title ~~configure: PNGVER environment variable to pick up libpng16.dll from OSGeo4W v2~~ configure: Checking for libpng{VERSION}.dll from OSGeo4W v2 Dec 2, 2022

HuidaeCho added 2 commits December 3, 2022 10:38

Add libpng-config (part of libpng) support and missing script for OSG…

1f75395

…eo4W

Add --dll-version to libpng-config; Update gdal-config to detect libp…

81d39a9

…ng version

HuidaeCho added 2 commits December 3, 2022 12:16

Add --libpng-config to build_centos.sh

36e3c99

Fix for clang (no implicit declaration of function)

09cfb10

HuidaeCho changed the title ~~configure: Checking for libpng{VERSION}.dll from OSGeo4W v2~~ configure: Support for libpng-config Dec 4, 2022

HuidaeCho added the enhancement New feature or request label Dec 4, 2022

HuidaeCho added 2 commits December 4, 2022 01:17

Use libpng-config --ldflags instead of --libs to include -L flags

9e79bf3

Let's try LDFLAGS for Ubuntu 20.04

efd390b

nilason previously requested changes Dec 6, 2022

View reviewed changes

configure.ac Outdated Show resolved Hide resolved

HuidaeCho commented Dec 6, 2022

View reviewed changes

configure Show resolved Hide resolved

HuidaeCho added 4 commits December 6, 2022 07:34

Define HAVE_PNG_H

6d181f6

Consistent comments

a552e9b

Delete trailing spaces; Replace tabs+spaces+tabs with tabs+spaces

8a87aa0

Revert build_ubuntu-20.04.sh

97aee00

Add --static flag to libpng-config to include -lm -lz

ef071da

nilason approved these changes Dec 6, 2022

View reviewed changes

HuidaeCho merged commit 8efd228 into OSGeo:main Dec 6, 2022

HuidaeCho deleted the configure-png-version branch December 6, 2022 21:44

nilason added a commit to nilason/grass that referenced this pull request Dec 9, 2022

configure: fix un-synced configure file

f1ad6f4

Last minute changes to configure.ac with OSGeo#2679 never was generated to configure.

nilason mentioned this pull request Dec 9, 2022

configure: fix un-synced configure file #2691

Merged

nilason added a commit that referenced this pull request Dec 9, 2022

configure: fix un-synced configure file (#2691)

ba819c4

Last minute changes to configure.ac with commit 8efd228 (#2679) was never generated to configure.

neteler added this to the 8.3.0 milestone Feb 13, 2023

ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023

configure: fix un-synced configure file (OSGeo#2691)

8acf9c3

Last minute changes to configure.ac with commit 8efd228 (OSGeo#2679) was never generated to configure.

nilason mentioned this pull request Jun 28, 2023

grass: update to 8.3.0 macports/macports-ports#19221

Merged

12 tasks

neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023

configure: fix un-synced configure file (OSGeo#2691)

a99b6cd

Last minute changes to configure.ac with commit 8efd228 (OSGeo#2679) was never generated to configure.

nilason mentioned this pull request Jul 31, 2024

win: patch from OSGeo4W applied #4121

Merged

Uh oh!

Comments

Conversation

HuidaeCho commented Dec 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HuidaeCho commented Dec 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HuidaeCho commented Dec 3, 2022

Uh oh!

HuidaeCho commented Dec 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HuidaeCho commented Dec 4, 2022

Uh oh!

nilason left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nilason commented Dec 6, 2022

Uh oh!

Uh oh!

HuidaeCho commented Dec 6, 2022

Uh oh!

nilason commented Dec 6, 2022

Uh oh!

HuidaeCho commented Dec 6, 2022

Uh oh!

nilason commented Dec 6, 2022

Uh oh!

nilason left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

HuidaeCho commented Dec 2, 2022 •

edited

Loading

HuidaeCho commented Dec 2, 2022 •

edited

Loading

HuidaeCho commented Dec 4, 2022 •

edited

Loading