mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[alpha] Recognize and use "--sysroot=DIR" in libpng-config.in and libpng.pc.in

Browse Source 
Recognize and use environment variable $PKG_CONFIG_SYSROOT_DIR as default
setting of ${sysroot} in libpng.pc.in
This commit is contained in:
Glenn Randers-Pehrson
2010-01-02 11:26:24 -06:00
parent 298a278cc7
commit 8c8e58a2ee
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ANNOUNCE
View File

@@ -49,8 +49,8 @@ version 1.4.1alpha02 [December 11, 2009]
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
to put png.h and pngconf.h in $prefix/include, like the other scripts, to put png.h and pngconf.h in $prefix/include, like the other scripts,
instead of in $prefix/include/libpng. Also revised makefile.sco instead of in $prefix/include/libpng. Also revised makefile.sco
to put them in $prefix/include/libpng14 instead of in to put them in $prefix/include/libpng15 instead of in
$prefix/include/libpng/libpng14. $prefix/include/libpng/libpng15.
Relocated png_do_chop() to its original position in pngrtran.c; the Relocated png_do_chop() to its original position in pngrtran.c; the
change in version 1.2.41beta08 caused transparency to be handled wrong change in version 1.2.41beta08 caused transparency to be handled wrong
in some 16-bit datastreams (Yusaku Sugai). in some 16-bit datastreams (Yusaku Sugai).
@@ -67,6 +67,9 @@ version 1.5.0alpha01 [January 2, 2010]
Makefile.in to be consistent with changes in libpng-1.4.0rc03 Makefile.in to be consistent with changes in libpng-1.4.0rc03
Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr
in pngtest.c in pngtest.c
Recognize and use "--sysroot=DIR" in libpng-config.in and libpng.pc.in
Recognize and use environment variable $PKG_CONFIG_SYSROOT_DIR as default
setting of ${sysroot} in libpng.pc.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

7
CHANGES
View File

@@ -2431,8 +2431,8 @@ version 1.4.1alpha02 [December 11, 2009]
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
to put png.h and pngconf.h in $prefix/include, like the other scripts, to put png.h and pngconf.h in $prefix/include, like the other scripts,
instead of in $prefix/include/libpng. Also revised makefile.sco instead of in $prefix/include/libpng. Also revised makefile.sco
to put them in $prefix/include/libpng14 instead of in to put them in $prefix/include/libpng15 instead of in
$prefix/include/libpng/libpng14. $prefix/include/libpng/libpng15.
Relocated png_do_chop() to its original position in pngrtran.c; the Relocated png_do_chop() to its original position in pngrtran.c; the
change in version 1.2.41beta08 caused transparency to be handled wrong change in version 1.2.41beta08 caused transparency to be handled wrong
in some 16-bit datastreams (Yusaku Sugai). in some 16-bit datastreams (Yusaku Sugai).
@@ -2450,6 +2450,9 @@ version 1.5.0alpha01 [January 2, 2010]
Updated copyright year to 2010. Updated copyright year to 2010.
Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr
in pngtest.c in pngtest.c
Recognize and use "--sysroot=DIR" in libpng-config.in and libpng.pc.in
Recognize and use environment variable $PKG_CONFIG_SYSROOT_DIR as default
setting of ${sysroot} in libpng.pc.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

11
libpng-config.in
View File

@@ -3,7 +3,7 @@
# libpng-config # libpng-config
# provides configuration info for libpng. # provides configuration info for libpng.
# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson # Copyright (C) 2002, 2004, 2006, 2007, 2010 Glenn Randers-Pehrson
# This code is released under the libpng license. # This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer # For conditions of distribution and use, see the disclaimer
@@ -11,11 +11,12 @@
# Modeled after libxml-config. # Modeled after libxml-config.
sysroot=""
version="@PNGLIB_VERSION@" version="@PNGLIB_VERSION@"
prefix="@prefix@" prefix="${sysroot}@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="${sysroot}@exec_prefix@"
libdir="@libdir@" libdir="${sysroot}@libdir@"
includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" includedir="${sysroot}@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
I_opts="-I${includedir}" I_opts="-I${includedir}"

9
libpng.pc.in
View File

@@ -1,7 +1,8 @@
prefix=@prefix@ sysroot=${PKG_CONFIG_SYSROOT_DIR}
exec_prefix=@exec_prefix@ prefix=${sysroot}@prefix@
libdir=@libdir@ exec_prefix=${sysroot}@exec_prefix@
includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ libdir=${sysroot}@libdir@
includedir=${sysroot}@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
Name: libpng Name: libpng
Description: Loads and saves PNG files Description: Loads and saves PNG files