From 880c38ba18589a4a6dcff4a65fa1bf8e6b87402e Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 12 Sep 2004 11:40:47 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r29107, which included commits to RCS files with non-trunk default branches. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/png/pngnow.png | Bin 2018 -> 2069 bytes src/png/pngtest.png | Bin 8574 -> 8574 bytes src/png/scripts/libpng-config-head.in | 2 +- src/png/scripts/libpng.pc.in | 2 +- src/png/scripts/makefile.32sunu | 14 ++++++++-- src/png/scripts/makefile.64sunu | 14 ++++++++-- src/png/scripts/makefile.aix | 2 +- src/png/scripts/makefile.beos | 14 ++++++++-- src/png/scripts/makefile.cygwin | 16 +++++++++--- src/png/scripts/makefile.darwin | 14 ++++++++-- src/png/scripts/makefile.dec | 14 ++++++++-- src/png/scripts/makefile.gcmmx | 14 ++++++++-- src/png/scripts/makefile.hpgcc | 14 ++++++++-- src/png/scripts/makefile.hpux | 14 ++++++++-- src/png/scripts/makefile.linux | 14 ++++++++-- src/png/scripts/makefile.ne12bsd | 2 +- src/png/scripts/makefile.netbsd | 2 +- src/png/scripts/makefile.openbsd | 2 +- src/png/scripts/makefile.sco | 14 ++++++++-- src/png/scripts/makefile.sggcc | 18 ++++++++++--- src/png/scripts/makefile.so9 | 14 ++++++++-- src/png/scripts/makefile.solaris | 14 ++++++++-- src/png/scripts/pngos2.def | 30 ++++++++++++++++++++- src/png/scripts/pngw32.def | 36 +++++++++++++++++++++++++- 24 files changed, 242 insertions(+), 38 deletions(-) diff --git a/src/png/pngnow.png b/src/png/pngnow.png index 174b5fa057f0e755d9d68f07d6ae385e387d5a95..82793ebddb7863266a66ffc6ab2c01ca32100808 100644 GIT binary patch delta 1339 zcmV-B1;qN|50wy*Kq>$rV@Og>004R>004l5008;`004mK004C`008P>0026e000+o zoVrmwu|BW@f96RauWmS;A%lN=@jo6?3Vyhp7y*YcLM0 zEDwtwtAI#UWNkw0=A(=fHKWq(O-h1Rrj%M**~9*-&b_nmUnc&Nvv=;^xjS>d`Of*y znRPhk+FhW_U=4NR7hK3o(KY&2{v{WUYnp-(0&Q*i;}8lo8_;6ru)s-|&%91I z3>$(Q%&<}{sMw)41X27BXF)y-XkDW=nqjkXfBl9wh^T6$y|vuTu<&^;oY5sGMh8I* z3pfelNdpJmG#VI)g}4^eTd6q>tZSLuHMZ5aK zTaqlU!(^b)a&pm6x2_*}Zt(e<7xdQ37l&SI+4l0#E3sF%50AVSGbIbli;DGGvxO+A ze^&fBJKNJN)c7DYhv<&-#OoWZ`PxpcWf*pK^{W8GUHvu-F9ym(7(-c7%BaO$VihJF z4^kErLj-Z}*-z-W=KcRw#mr7){lM4+{f*5k?H1HHaL? z2;eWlzG7nxR_=%H0|(zdxV`q!{`a89?2EYz zqC#6+vULx-QZ~m1LZ})7)U}mMVzt}rJDhFWE4J4f0*6o zXP*y$5l9>zJkVqw>I{FWLWqXTZ5BeeqOgN@d7yr|tPH~Iahrpv4?{~SO2NX&G;=z^ z!eMvISLSf*vASJ#?D*u@kvN4=q~(OQpflp0l#2357^;iMrlORQj`)F7dxNuR8%L6M zE~Xr1%G8uIx4I`I(!R4yEjsj~b|yYMp9f8wM6VUDeB zpJ|^SGlyo{S9hmb$Sz2vdhj#|wp3-GO>HuUsZZ8LX<1I7Y!;dcstG|5LzBZ^Cs_yx z(L}J*;T;@b9HRM&_ML`6rGYESqS{~TEX&VDmtJfe>LXfghM7!j)MGLX#EgO2rfa>CSuBwR+Q!Q_T_LrNTuDkcAYaaCip(owExt9z8J>c)ckPt#r34k(*6s8uT(X^oLXu}T54Du{Q5N((AN6;M#|z`x2jySaa&<@d9b z*~#q7?)&z8?|pA$v(5K_`9}~CD1%Cyf@`a1a%Uv`( zoZ>#W$L*ObiwavMqDXlN2LCZ!;y#a;_my zWvV!dtSAb(Ndbit0)*588qp#)lv;t3>gxT1N->L?n{QdNblI)T8v?i8e#f1`yY3F& zlYyWXgvZ;+Os6Wtg@5DWB(%x2FjW;7p;ZJ`a!6uUN~J9Bz3=|Oij@yMxU`|>p@&yJ zvU<(h6@@I^UR;#HAyaIj5- zh+f137u9^`4XUPD5L{!Lk!3-Jg<23q^4si=QWns@PHxeodVkBtO&t)EvzU`2BOGQdbr!eZgYKzRsb zSeBGBYA~nRMG41)2m?ykpdHR@v52IG!UGHXlTC6t#9{+`_P+kc=)O0@F-*i*Ru?`L z2Kpk5Xew(KIZhJB<8Ki@hRAVIStQAcm5U0$y`rip7k{b#)Z6>r+BmE}0KEqfy>n=1 z;P8QWp+O%=y2?^kMNN2pZerC^5|zy~YW z99ees!($%}>^Qo7-;pgJkMC_6Dr>WJfo1DMkDOcb;F_xO9E67DML-+OK-fi`3Mxv~ zgRa;Ze1DSGd-YF08~Hq#J~ni)RX^Mv{X&K?jaFMMMBNHuhb(zu{c=+ogg2p?gV2Yj zWGhNSVdR@Ron+CdEApj2(tf;gcOyG7^;IlIAsmaGG!}KoTvKL6c}y6pipQox%1B52 zz^P^6EZ)J9q?L4XW&FDocRuVt2@u0(|cj|d-&mefx3k*Jag5BU9#KkQb~`xaN*p=i$B)= zG;`_l?9abkzI6WVuUA(6mg`Z5**_)>pn#>1S}=D;c9IbGaUP;_Uft7GrJZ*16$s#? z|9`HJukW1goEg`LXFJ#S=2)0r(CmF886mJr)$FrbBV(BQj4mpxiUMV^P;`)W2!WW2 zIjwz$g@6!E1Untx!STf*nxAOjIS8yYaAsK4`z!5LrMaj*uKyAG^JG)->SW^TsgXUh z^4H|#w#i&BydLwwc8cAVshat^$g{v2bA58cp`Z;qN^_wkAe0tdLb^pnH)pP*44=p6 zn}`D!EgO9?6as$XY1~3ZA!HFfEgI#ws$4K=_1?on@{OeGi*AHR7 yz4JY4UjC|?(+U*K_m~d^t!r>p+hwj@`1u>u#r#~T;*-Vz0000KbJ8=r5LXZfmdZtCO(3ikkym<%NV delta 22 ecmez8^v`L+QznbvjnB8rvk0>u`!{)k!aV?m77IE6 diff --git a/src/png/scripts/libpng-config-head.in b/src/png/scripts/libpng-config-head.in index 1e0766f38c..d9d8e891e0 100755 --- a/src/png/scripts/libpng-config-head.in +++ b/src/png/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.6 +version=1.2.7 prefix="" libdir="" libs="" diff --git a/src/png/scripts/libpng.pc.in b/src/png/scripts/libpng.pc.in index 4d4f0b7321..556a343387 100644 --- a/src/png/scripts/libpng.pc.in +++ b/src/png/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.6 +Version: 1.2.7 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/src/png/scripts/makefile.32sunu b/src/png/scripts/makefile.32sunu index bda63ad7f1..2ace57fb44 100644 --- a/src/png/scripts/makefile.32sunu +++ b/src/png/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -183,7 +183,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.64sunu b/src/png/scripts/makefile.64sunu index 91ab359900..8ee4d56576 100644 --- a/src/png/scripts/makefile.64sunu +++ b/src/png/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -184,7 +184,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.aix b/src/png/scripts/makefile.aix index 029ca44c0d..a1e474d14d 100644 --- a/src/png/scripts/makefile.aix +++ b/src/png/scripts/makefile.aix @@ -18,7 +18,7 @@ RM = rm -f LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/src/png/scripts/makefile.beos b/src/png/scripts/makefile.beos index 73aff60ea6..0e842bd73c 100644 --- a/src/png/scripts/makefile.beos +++ b/src/png/scripts/makefile.beos @@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -165,7 +165,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) -W1,-rpath $(ZLIBLIB):$(DL) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ diff --git a/src/png/scripts/makefile.cygwin b/src/png/scripts/makefile.cygwin index a5fa3546ca..bb0d7b6295 100644 --- a/src/png/scripts/makefile.cygwin +++ b/src/png/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll @@ -176,7 +176,7 @@ $(STATLIB): $(OBJS) ar rc $@ $(OBJS) $(RANLIB) $@ -$(SHAREDDEF): projects/msvc/png32ms.def +$(SHAREDDEF): scripts/png32ms.def cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \ sed -e 's/\([^;]*\);/;/' > $@ @@ -260,7 +260,17 @@ test-config-install: $(DB)/libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ diff --git a/src/png/scripts/makefile.darwin b/src/png/scripts/makefile.darwin index 924eca2a4e..935eb98f41 100644 --- a/src/png/scripts/makefile.darwin +++ b/src/png/scripts/makefile.darwin @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -167,7 +167,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ diff --git a/src/png/scripts/makefile.dec b/src/png/scripts/makefile.dec index ac37fae29e..09b51587eb 100644 --- a/src/png/scripts/makefile.dec +++ b/src/png/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -148,7 +148,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -w1 -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.gcmmx b/src/png/scripts/makefile.gcmmx index 2cb7125135..fc4b797ca3 100644 --- a/src/png/scripts/makefile.gcmmx +++ b/src/png/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -212,7 +212,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) -I$(ZLIBINC) \ diff --git a/src/png/scripts/makefile.hpgcc b/src/png/scripts/makefile.hpgcc index 03027156ff..fd79e1bf3d 100644 --- a/src/png/scripts/makefile.hpgcc +++ b/src/png/scripts/makefile.hpgcc @@ -41,7 +41,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -176,7 +176,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.hpux b/src/png/scripts/makefile.hpux index 6a8a2d7ac4..53f99b5100 100644 --- a/src/png/scripts/makefile.hpux +++ b/src/png/scripts/makefile.hpux @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -162,7 +162,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.linux b/src/png/scripts/makefile.linux index 3eba565b00..67edfd977a 100644 --- a/src/png/scripts/makefile.linux +++ b/src/png/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -184,7 +184,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) -I$(ZLIBINC) \ diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd index 48066969cd..32d53720c5 100644 --- a/src/png/scripts/makefile.ne12bsd +++ b/src/png/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.6 +SHLIB_MINOR= 1.2.7 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/src/png/scripts/makefile.netbsd b/src/png/scripts/makefile.netbsd index a701526727..dc0b8b4590 100644 --- a/src/png/scripts/makefile.netbsd +++ b/src/png/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.6 +SHLIB_MINOR= 1.2.7 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/src/png/scripts/makefile.openbsd b/src/png/scripts/makefile.openbsd index 80c6bd265b..4cac2fa0f3 100644 --- a/src/png/scripts/makefile.openbsd +++ b/src/png/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.6 +SHLIB_MINOR= 1.2.7 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/src/png/scripts/makefile.sco b/src/png/scripts/makefile.sco index 7a4dc4f77d..b37e72dd5d 100644 --- a/src/png/scripts/makefile.sco +++ b/src/png/scripts/makefile.sco @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -162,7 +162,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ diff --git a/src/png/scripts/makefile.sggcc b/src/png/scripts/makefile.sggcc index 9886476fde..0902697848 100644 --- a/src/png/scripts/makefile.sggcc +++ b/src/png/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -169,14 +169,26 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(DL) -L$(ZLIBLIB) \ + -rpath $(ZLIBLIB):$(DL)\ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ + -L$(ZLIBLIB) \ + -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png diff --git a/src/png/scripts/makefile.so9 b/src/png/scripts/makefile.so9 index dd08212bd6..c907deda91 100644 --- a/src/png/scripts/makefile.so9 +++ b/src/png/scripts/makefile.so9 @@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -182,7 +182,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \ + -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/makefile.solaris b/src/png/scripts/makefile.solaris index db2fc1cda6..8455c33f6d 100644 --- a/src/png/scripts/makefile.solaris +++ b/src/png/scripts/makefile.solaris @@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.6 +PNGMIN = 1.2.7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -179,7 +179,17 @@ install-config: libpng-config install: install-static install-shared install-man install-config # If you installed in $(DESTDIR), test-installed won't work until you -# move the library to its final location. +# move the library to its final location. Use test-dd to test it +# before then. + +test-dd: + echo + echo Testing installed dynamic shared library in $(DL). + $(CC) -I$(DI) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \ + -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) + ./pngtestd pngtest.png test-installed: echo diff --git a/src/png/scripts/pngos2.def b/src/png/scripts/pngos2.def index bb21d979cf..1b75bc6036 100644 --- a/src/png/scripts/pngos2.def +++ b/src/png/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.6 +; Version 1.2.7 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" @@ -184,6 +184,34 @@ EXPORTS png_convert_to_rfc1123 png_set_invalid +; Added at version 1.2.0: + png_mmx_support + png_permit_empty_plte + png_permit_mng_features + png_get_mmx_flagmask + png_get_asm_flagmask + png_get_asm_flags + png_get_mmx_bitdepth_threshold + png_get_mmx_rowbytes_threshold + png_set_asm_flags + png_init_mmx_flags + +; Added at version 1.2.2: + png_handle_as_unknown + +; Added at version 1.2.2 and deleted from 1.2.3: +; png_zalloc +; png_zfree + +; Added at version 1.2.4 + png_malloc_warn + +; Added at version 1.2.6 + png_set_user_limits + png_get_user_height_max + png_get_user_width_max +; Added at version 1.2.7 + png_set_add_alpha ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS png_libpng_ver diff --git a/src/png/scripts/pngw32.def b/src/png/scripts/pngw32.def index 0a174112b7..5bff2d2ab8 100644 --- a/src/png/scripts/pngw32.def +++ b/src/png/scripts/pngw32.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.2.6 +;Version 1.2.7 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -191,3 +191,37 @@ EXPORTS png_write_init_3 @176 png_info_init_3 @177 png_destroy_struct @178 +; Added at version 1.2.0 +; For use with PNG_USER_MEM_SUPPORTED + png_destroy_struct_2 @179 + png_create_read_struct_2 @180 + png_create_write_struct_2 @181 + png_malloc_default @182 + png_free_default @183 +; MNG features + png_permit_mng_features @184 +; MMX support + png_mmx_support @185 + png_get_mmx_flagmask @186 + png_get_asm_flagmask @187 + png_get_asm_flags @188 + png_get_mmx_bitdepth_threshold @189 + png_get_mmx_rowbytes_threshold @190 + png_set_asm_flags @191 + png_init_mmx_flags @192 +; Strip error numbers + png_set_strip_error_numbers @193 +; Added at version 1.2.2 + png_handle_as_unknown @194 +; Added at version 1.2.2 and deleted from 1.2.3 +; png_zalloc @195 +; png_zfree @196 +; Added at version 1.2.4 + png_malloc_warn @195 +; Added at version 1.2.6 + png_malloc_warn @195 + png_get_user_height_max @196 + png_get_user_width_max @197 + png_set_user_limits @198 +; Added at version 1.2.7 + png_set_add_alpha @199 -- 2.45.2