diff options
| -rw-r--r-- | UPDATING | 12 | ||||
| -rw-r--r-- | games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m | 12 | ||||
| -rw-r--r-- | graphics/png/Makefile | 40 | ||||
| -rw-r--r-- | graphics/png/distinfo | 8 | ||||
| -rw-r--r-- | graphics/png/files/patch-libpng-config-body.in | 16 | ||||
| -rw-r--r-- | graphics/png/files/patch-makefile.freebsd | 43 | ||||
| -rw-r--r-- | graphics/png/pkg-plist | 25 |
7 files changed, 44 insertions, 112 deletions
@@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20141225: + AFFECTS: users of graphics/png + AUTHOR: antoine@FreeBSD.org + + The PNG library has been updated to version 1.6.16. Please rebuild all + ports that depend on it. + + If you use portmaster: + portmaster -r png + If you use portupgrade: + portupgrade -fr graphics/png + 20141224: AFFECTS: users of lang/neon29 AUTHOR: ohauer@FreeBSD.org diff --git a/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m b/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m new file mode 100644 index 000000000000..8748d58b839b --- /dev/null +++ b/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m @@ -0,0 +1,12 @@ +--- src/Core/Materials/OOPNGTextureLoader.m.orig 2014-06-30 08:50:36 UTC ++++ src/Core/Materials/OOPNGTextureLoader.m +@@ -31,9 +31,6 @@ SOFTWARE. + #import "OOCPUInfo.h" + #import "NSDataOOExtensions.h" + +-void png_error(png_structp, png_const_charp) NO_RETURN_FUNC; +- +- + static void PNGError(png_structp png, png_const_charp message); + static void PNGWarning(png_structp png, png_const_charp message); + static void PNGRead(png_structp png, png_bytep bytes, png_size_t size); diff --git a/graphics/png/Makefile b/graphics/png/Makefile index dec4b3ecd5d4..cad2e7f8a3e5 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -2,24 +2,21 @@ # $FreeBSD$ PORTNAME= png -PORTVERSION= 1.5.21 +PORTVERSION= 1.6.16 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} +PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/ DISTNAME= lib${PORTNAME}-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= portmgr@FreeBSD.org COMMENT= Library for manipulating PNG images -PORTSCOUT= limit:^1\.5\. - USES= cmake cpe tar:xz CPE_PRODUCT= libpng GNU_CONFIGURE= yes USE_LDCONFIG= yes CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man -SOSUFFIX= .${PORTVERSION:E} OPTIONS_DEFINE=APNG PNGTEST OPTIONS_DEFAULT=APNG PNGTEST @@ -28,25 +25,12 @@ PNGTEST_DESC=Enable Regression Test (recommended) .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL) -MASTER_SITES+= SF/apng/libpng/libpng15/:apng -DISTFILES+= ${DISTNAME}-apng.patch.gz:apng -EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} -.endif -.if ${PORT_OPTIONS:MAPNG} -EXTRA_PATCHES+= ${WRKSRC}/${DISTNAME}-apng.unix -.endif - -post-extract: -.if ${PORT_OPTIONS:MAPNG} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}-apng.patch.gz ${WRKSRC}/ - ${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz - ${TR} -d '\r' < ${WRKSRC}/${DISTNAME}-apng.patch > ${WRKSRC}/${DISTNAME}-apng.unix +.if ${PORT_OPTIONS:MAPNG} || make(makesum) +PATCHFILES= ${DISTNAME}-apng.patch.gz .endif post-patch: ${REINPLACE_CMD} \ - -e 's|RELEASE}.0|RELEASE}|' \ -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt @@ -61,18 +45,4 @@ post-build: fi) .endif -pre-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/include/libpng - ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig - -post-install: - ${INSTALL_DATA} ${WRKSRC}/pngdebug.h ${WRKSRC}/pnginfo.h \ - ${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \ - ${STAGEDIR}${PREFIX}/include/libpng15/ - -${RMDIR} ${STAGEDIR}${PREFIX}/include/libpng - ${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc - ${LN} -sf libpng15.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc - ${RM} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15 - ${MV} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15${SOSUFFIX} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15 - .include <bsd.port.mk> diff --git a/graphics/png/distinfo b/graphics/png/distinfo index d9d07f51b830..5709f8f4a072 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,4 +1,4 @@ -SHA256 (libpng-1.5.21.tar.xz) = b5151c64bc70489997790a492e1094d106be90a22b2958c43eee25a70dffdba7 -SIZE (libpng-1.5.21.tar.xz) = 734356 -SHA256 (libpng-1.5.21-apng.patch.gz) = 8a4fffa885f1a1a34a7bdcaa2d1b8f1e025f6e1cf9c5bf17224672d2a6948d94 -SIZE (libpng-1.5.21-apng.patch.gz) = 9511 +SHA256 (libpng-1.6.16.tar.xz) = 42f754df633e4e700544e5913cbe2fd4928bbfccdc07708a5cf84e59827fbe60 +SIZE (libpng-1.6.16.tar.xz) = 907284 +SHA256 (libpng-1.6.16-apng.patch.gz) = 07eb4825f6787283aa2c4f77b6fd421875ec7982e2a5b1705c3bea0cdccf5c2d +SIZE (libpng-1.6.16-apng.patch.gz) = 9552 diff --git a/graphics/png/files/patch-libpng-config-body.in b/graphics/png/files/patch-libpng-config-body.in deleted file mode 100644 index 5666752ac236..000000000000 --- a/graphics/png/files/patch-libpng-config-body.in +++ /dev/null @@ -1,16 +0,0 @@ ---- scripts/libpng-config-body.in.orig Wed Sep 18 08:05:43 2002 -+++ scripts/libpng-config-body.in Sun Jul 23 10:27:47 2006 -@@ -77,8 +77,12 @@ - echo ${R_opts} - ;; - -+ --ldopts) -+ echo ${ldopts} -+ ;; -+ - --ldflags) -- echo ${ldflags} ${L_opts} ${R_opts} ${libs} -+ echo ${ldopts} ${L_opts} ${R_opts} ${libs} - ;; - - --static) diff --git a/graphics/png/files/patch-makefile.freebsd b/graphics/png/files/patch-makefile.freebsd deleted file mode 100644 index b79639464428..000000000000 --- a/graphics/png/files/patch-makefile.freebsd +++ /dev/null @@ -1,43 +0,0 @@ ---- scripts/makefile.freebsd.orig 2012-06-14 13:28:01.000000000 +0200 -+++ scripts/makefile.freebsd 2012-06-20 21:11:47.000000000 +0200 -@@ -15,13 +15,13 @@ - NO_OBJ= YES - - # where make install puts libpng.a and png.h --DESTDIR= ${PREFIX} --LIBDIR= /lib -+#DESTDIR= ${PREFIX} -+LIBDIR= ${PREFIX}/lib - INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h --INCSDIR= /include/libpng -+INCSDIR= ${PREFIX}/include/libpng - INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk - MAN= libpng.3 libpngpf.3 png.5 --MANDIR= /man/man -+MANDIR= ${PREFIX}/man/man - SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ - libpng/pngconf.h ${INCSDIR}/../pngconf.h \ - libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h -@@ -53,4 +53,22 @@ - writelock: - chmod a-w *.[ch35] $(DOCS) scripts/* - -+libpng-config: -+ ( cat scripts/libpng-config-head.in; \ -+ echo prefix=\"${PREFIX}\"; \ -+ echo libdir=\"${LIBDIR}\"; \ -+ echo ccopts=\"${ccopts}\"; \ -+ echo cppflags=\"${cppflags}\"; \ -+ echo I_opts=\"-I${INCSDIR}\"; \ -+ echo L_opts=\"-L${LIBDIR}\"; \ -+ echo libs=\"-lpng -lz -lm\"; \ -+ echo ldopts=\"${ldopts}\"; \ -+ cat scripts/libpng-config-body.in ) > libpng-config -+ chmod +x libpng-config -+ -+beforeinstall: libpng-config -+ ${BSD_INSTALL_SCRIPT} \ -+ libpng-config ${PREFIX}/bin -+ ln -sf libpng-config ${PREFIX}/bin/libpng15-config -+ - .include <bsd.lib.mk> diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index ee70fee9cad4..8e329ff126fd 100644 --- a/graphics/png/pkg-plist +++ b/graphics/png/pkg-plist @@ -1,24 +1,21 @@ bin/libpng-config -bin/libpng15-config -include/libpng15/png.h -include/libpng15/pngconf.h -include/libpng15/pngdebug.h -include/libpng15/pnginfo.h -include/libpng15/pnglibconf.h -include/libpng15/pngpriv.h -include/libpng15/pngstruct.h +bin/libpng16-config +include/libpng16/png.h +include/libpng16/pngconf.h +include/libpng16/pnglibconf.h include/png.h include/pngconf.h include/pnglibconf.h lib/libpng.a lib/libpng.so -libdata/pkgconfig/libpng15.pc +lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake +lib/libpng/libpng16.cmake +lib/libpng16.a +lib/libpng16.so +lib/libpng16.so.16 +lib/libpng16.so.16.16.0 libdata/pkgconfig/libpng.pc -lib/libpng/libpng15-%%CMAKE_BUILD_TYPE%%.cmake -lib/libpng/libpng15.cmake -lib/libpng15.a -lib/libpng15.so -lib/libpng15.so.15 +libdata/pkgconfig/libpng16.pc man/man3/libpng.3.gz man/man3/libpngpf.3.gz man/man5/png.5.gz |