diff --git a/ANNOUNCE b/ANNOUNCE index 68f15a6a9..00be58a44 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 diff --git a/CHANGES b/CHANGES index 58a459b99..94205f658 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/libpng-config.in b/libpng-config.in index 50d344206..9874b4c41 100755 --- a/libpng-config.in +++ b/libpng-config.in @@ -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}" diff --git a/libpng.pc.in b/libpng.pc.in index 4ba1c6263..3e7e2c58a 100644 --- a/libpng.pc.in +++ b/libpng.pc.in @@ -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