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] Undid recent changes involving embedding $sysroot in libpng.pc.in

Browse Source 
and libpng-config.in.  It is the job of pkg-config, not foo.pc, to mangle
the directory locations when $PKG_CONFIG_SYSROOT_DIR has been defined.
This commit is contained in:
Glenn Randers-Pehrson
2010-01-02 20:45:33 -06:00
parent 30109843c3
commit 9b085c6c74
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ANNOUNCE
View File

@@ -1,5 +1,5 @@
Libpng 1.5.0alpha01 - January 2, 2010
Libpng 1.5.0alpha01 - January 3, 2010
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -55,7 +55,7 @@ version 1.4.1alpha02 [December 11, 2009]
change in version 1.2.41beta08 caused transparency to be handled wrong
in some 16-bit datastreams (Yusaku Sugai).
version 1.5.0alpha01 [January 2, 2010]
version 1.5.0alpha01 [January 3, 2010]
Bump version to 1.5.0alpha01
Add "depth" parameter to private png_build_gamma_table()
Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
@@ -70,6 +70,9 @@ version 1.5.0alpha01 [January 2, 2010]
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
Removed the just-added sysroot feature. It is the job of pkg-config,
not foo.pc, to mangle the directory locations when $PKG_CONFIG_SYSROOT_DIR
has been defined.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

5
CHANGES
View File

@@ -2437,7 +2437,7 @@ version 1.4.1alpha02 [December 11, 2009]
change in version 1.2.41beta08 caused transparency to be handled wrong
in some 16-bit datastreams (Yusaku Sugai).
version 1.5.0alpha01 [January 2, 2010]
version 1.5.0alpha01 [January 3, 2010]
Bump version to 1.5.0alpha01
Add "depth" parameter to private png_build_gamma_table()
Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
@@ -2453,6 +2453,9 @@ version 1.5.0alpha01 [January 2, 2010]
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
Removed the just-added sysroot feature. It is the job of pkg-config,
not foo.pc, to mangle the directory locations when $PKG_CONFIG_SYSROOT_DIR
has been defined.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net

9
libpng-config.in
View File

@@ -11,12 +11,11 @@
# Modeled after libxml-config.
sysroot=""
version="@PNGLIB_VERSION@"
prefix="${sysroot}@prefix@"
exec_prefix="${sysroot}@exec_prefix@"
libdir="${sysroot}@libdir@"
includedir="${sysroot}@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
libdir="@libdir@"
includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
I_opts="-I${includedir}"

9
libpng.pc.in
View File

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