summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2014-03-17 09:30:55 +0000
committertron <tron>2014-03-17 09:30:55 +0000
commit69284b0b58237593f9e98ed4b0fb961e9b1903bf (patch)
tree8d361aa875f7875e20f2e062a2dcd89e84f0ae68
parent1100b26d6eaf52afe0f27c88c1d42e386db459cf (diff)
downloadpkgsrc-69284b0b58237593f9e98ed4b0fb961e9b1903bf.tar.gz
Pullup ticket #4347 - requested by spz
graphics/freetype2: security update Revisions pulled up: - graphics/freetype2/Makefile 1.92-1.94 - graphics/freetype2/PLIST 1.21 - graphics/freetype2/buildlink3.mk 1.38-1.43 - graphics/freetype2/distinfo 1.51 - graphics/freetype2/options.mk 1.1-1.2 --- Module Name: pkgsrc Committed By: spz Date: Thu Mar 13 23:26:35 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: Makefile PLIST buildlink3.mk distinfo Log Message: security update, upstream short changelog ('here' being releasenotes): FreeType 2.5.3 2014-03-08 FreeType 2.5.3 has been released. All users should upgrade due to fixed vulnerability in the CFF driver (CVE-2014-2240). Its main new feature is much enhanced support of auto-hinting SFNT fonts (i.e., TrueType and CFF fonts) due to the use of the HarfBuzz library. A more detailed description of this and other changes can be found here. FreeType 2.5.2 2013-12-08 FreeType 2.5.2 has been released. It fixes a serious bug introduced in version 2.5.1; all users should upgrade. A listing of the changes can be found here. FreeType 2.5.1 2013-11-25 FreeType 2.5.1 has been released, providing three major new features. - Support for the WOFF font format, contributed by Behdad Esfahbod. - The auto-hinter now supports Hebrew, together with improved support for Cyrillic and Greek. - The directory layout of the (installed) FreeType header files has been simplified. Among other changes I want to mention that FreeType's TrueType debugger (ttdebug) has been made more versatile. An exhaustive list of changes can be found here. FreeType 2.5 2013-06-19 FreeType 2.5 has been released. A major new feature is support for color embedded bitmaps (eg. color emoji), contributed by Behdad Esfahbod on behalf of Google. Additionally, Adobe's CFF engine is now the default, which makes a good reason to change from the 2.4.x to the 2.5.x series. On the technical side, the property API to access FreeType module parameters (FT_Property_Set and FT_Property_Get) is now declared as stable. As usual, see this file for the complete release notes, which give more details. And we have again blog entries from Adobe and Google. FreeType 2.4.12 2013-05-08 FreeType 2.4.12 has been released. A major new feature is a new parsing and hinting engine for CFF fonts, contributed by Adobe in collaboration with Google. It was my job the last few months to fully adapt the code to FreeType, and we are very pleased with the results. You might also read the blog entries from Adobe and Google. In connection with the new CFF engine, the demo programs, especially ftview and ftdiff, have been improved a lot; as usual, more details on the changes can be found in the release notes. --- Module Name: pkgsrc Committed By: ryoon Date: Fri Mar 14 13:12:34 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: buildlink3.mk Log Message: graphics/png is also needed now --- Module Name: pkgsrc Committed By: ryoon Date: Fri Mar 14 13:38:20 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: buildlink3.mk Log Message: graphics/png should be included when non-builtin freetype2. Pointed out by obache@, thank you. --- Module Name: pkgsrc Committed By: obache Date: Fri Mar 14 13:43:17 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: buildlink3.mk Log Message: To get USE_BUILTIN.freetype2, builtin.mk must be included. --- Module Name: pkgsrc Committed By: ryoon Date: Fri Mar 14 14:54:02 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: Makefile buildlink3.mk Added Files: pkgsrc/graphics/freetype2: options.mk Log Message: Make png dependency as option, and move option to options.mk Revert bump of BUILDLINK_ABI_DEPENDS.freetype2 --- Module Name: pkgsrc Committed By: drochner Date: Fri Mar 14 19:39:52 UTC 2014 Modified Files: pkgsrc/graphics/freetype2: Makefile buildlink3.mk options.mk Log Message: make the optional-png logics work
-rw-r--r--graphics/freetype2/Makefile14
-rw-r--r--graphics/freetype2/PLIST104
-rw-r--r--graphics/freetype2/buildlink3.mk14
-rw-r--r--graphics/freetype2/distinfo8
-rw-r--r--graphics/freetype2/options.mk18
5 files changed, 91 insertions, 67 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 0c316c54109..bcc5a9db60f 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2013/12/23 11:57:04 wiz Exp $
+# $NetBSD: Makefile,v 1.91.2.1 2014/03/17 09:30:55 tron Exp $
-DISTNAME= freetype-2.4.12
+DISTNAME= freetype-2.5.3
PKGNAME= ${DISTNAME:S/-/2-/}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \
@@ -32,15 +32,7 @@ PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
-PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
-PKG_SUPPORTED_OPTIONS= subpixel
-
-.include "../../mk/bsd.options.mk"
-
-# subpixel (lcd) rendering, patent issues
-.if !empty(PKG_OPTIONS:Msubpixel)
-CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
-.endif
+.include "options.mk"
# source code breaks strict aliasing in gcc>=2.95
.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 823640bffe3..d8efc8c6f1f 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,55 +1,57 @@
-@comment $NetBSD: PLIST,v 1.20 2013/08/04 10:38:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.20.4.1 2014/03/17 09:30:55 tron Exp $
bin/freetype-config
-include/freetype2/freetype/config/ftconfig.h
-include/freetype2/freetype/config/ftheader.h
-include/freetype2/freetype/config/ftmodule.h
-include/freetype2/freetype/config/ftoption.h
-include/freetype2/freetype/config/ftstdlib.h
-include/freetype2/freetype/freetype.h
-include/freetype2/freetype/ftadvanc.h
-include/freetype2/freetype/ftautoh.h
-include/freetype2/freetype/ftbbox.h
-include/freetype2/freetype/ftbdf.h
-include/freetype2/freetype/ftbitmap.h
-include/freetype2/freetype/ftbzip2.h
-include/freetype2/freetype/ftcache.h
-include/freetype2/freetype/ftcffdrv.h
-include/freetype2/freetype/ftchapters.h
-include/freetype2/freetype/ftcid.h
-include/freetype2/freetype/fterrdef.h
-include/freetype2/freetype/fterrors.h
-include/freetype2/freetype/ftgasp.h
-include/freetype2/freetype/ftglyph.h
-include/freetype2/freetype/ftgxval.h
-include/freetype2/freetype/ftgzip.h
-include/freetype2/freetype/ftimage.h
-include/freetype2/freetype/ftincrem.h
-include/freetype2/freetype/ftlcdfil.h
-include/freetype2/freetype/ftlist.h
-include/freetype2/freetype/ftlzw.h
-include/freetype2/freetype/ftmac.h
-include/freetype2/freetype/ftmm.h
-include/freetype2/freetype/ftmodapi.h
-include/freetype2/freetype/ftmoderr.h
-include/freetype2/freetype/ftotval.h
-include/freetype2/freetype/ftoutln.h
-include/freetype2/freetype/ftpfr.h
-include/freetype2/freetype/ftrender.h
-include/freetype2/freetype/ftsizes.h
-include/freetype2/freetype/ftsnames.h
-include/freetype2/freetype/ftstroke.h
-include/freetype2/freetype/ftsynth.h
-include/freetype2/freetype/ftsystem.h
-include/freetype2/freetype/fttrigon.h
-include/freetype2/freetype/fttypes.h
-include/freetype2/freetype/ftwinfnt.h
-include/freetype2/freetype/ftxf86.h
-include/freetype2/freetype/t1tables.h
-include/freetype2/freetype/ttnameid.h
-include/freetype2/freetype/tttables.h
-include/freetype2/freetype/tttags.h
-include/freetype2/freetype/ttunpat.h
-include/ft2build.h
+include/freetype2/config/ftconfig.h
+include/freetype2/config/ftheader.h
+include/freetype2/config/ftmodule.h
+include/freetype2/config/ftoption.h
+include/freetype2/config/ftstdlib.h
+include/freetype2/freetype.h
+include/freetype2/ft2build.h
+include/freetype2/ftadvanc.h
+include/freetype2/ftautoh.h
+include/freetype2/ftbbox.h
+include/freetype2/ftbdf.h
+include/freetype2/ftbitmap.h
+include/freetype2/ftbzip2.h
+include/freetype2/ftcache.h
+include/freetype2/ftcffdrv.h
+include/freetype2/ftchapters.h
+include/freetype2/ftcid.h
+include/freetype2/fterrdef.h
+include/freetype2/fterrors.h
+include/freetype2/ftgasp.h
+include/freetype2/ftglyph.h
+include/freetype2/ftgxval.h
+include/freetype2/ftgzip.h
+include/freetype2/ftimage.h
+include/freetype2/ftincrem.h
+include/freetype2/ftlcdfil.h
+include/freetype2/ftlist.h
+include/freetype2/ftlzw.h
+include/freetype2/ftmac.h
+include/freetype2/ftmm.h
+include/freetype2/ftmodapi.h
+include/freetype2/ftmoderr.h
+include/freetype2/ftotval.h
+include/freetype2/ftoutln.h
+include/freetype2/ftpfr.h
+include/freetype2/ftrender.h
+include/freetype2/ftsizes.h
+include/freetype2/ftsnames.h
+include/freetype2/ftstroke.h
+include/freetype2/ftsynth.h
+include/freetype2/ftsystem.h
+include/freetype2/fttrigon.h
+include/freetype2/ftttdrv.h
+include/freetype2/fttypes.h
+include/freetype2/ftwinfnt.h
+include/freetype2/ftxf86.h
+include/freetype2/t1tables.h
+include/freetype2/ttnameid.h
+include/freetype2/tttables.h
+include/freetype2/tttags.h
+include/freetype2/ttunpat.h
lib/libfreetype.la
lib/pkgconfig/freetype2.pc
+man/man1/freetype-config.1
share/aclocal/freetype2.m4
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index fef401454d9..645f22375f0 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36.6.1 2014/03/14 08:21:50 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.36.6.2 2014/03/17 09:30:55 tron Exp $
BUILDLINK_TREE+= freetype2
@@ -15,8 +15,20 @@ BUILDLINK_FILES.freetype2+= bin/freetype-config
FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
+pkgbase := freetype2
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.freetype2:Mpng)
+CHECK_BUILTIN.freetype2:= yes
+.include "../../graphics/freetype2/builtin.mk"
+CHECK_BUILTIN.freetype2:= no
+
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.if empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
+.include "../../graphics/png/buildlink3.mk"
+.endif
+.endif
.endif # FREETYPE2_BUILDLINK3_MK
BUILDLINK_TREE+= -freetype2
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index a090c8edefe..e8149b63432 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.50 2013/08/04 10:38:01 adam Exp $
+$NetBSD: distinfo,v 1.50.4.1 2014/03/17 09:30:55 tron Exp $
-SHA1 (freetype-2.4.12.tar.bz2) = 382479336faefbc77e4b63c9ce4a96cf5d2c3585
-RMD160 (freetype-2.4.12.tar.bz2) = c731a48af570b5f4b461a73c9306be3a4799c60e
-Size (freetype-2.4.12.tar.bz2) = 1597205 bytes
+SHA1 (freetype-2.5.3.tar.bz2) = d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46
+RMD160 (freetype-2.5.3.tar.bz2) = fec7e2a74a9f30b3088b4370d304badfa7724ed5
+Size (freetype-2.5.3.tar.bz2) = 1703842 bytes
SHA1 (patch-aa) = d89f3f452354129df49d02d5063e712b57e8ba0e
SHA1 (patch-ab) = cb8c9552e2db1e1f3da3d20971c22f174e343162
diff --git a/graphics/freetype2/options.mk b/graphics/freetype2/options.mk
new file mode 100644
index 00000000000..902e0d94403
--- /dev/null
+++ b/graphics/freetype2/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.2.2.2 2014/03/17 09:30:55 tron Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
+PKG_SUPPORTED_OPTIONS= png subpixel
+
+.include "../../mk/bsd.options.mk"
+
+# subpixel (lcd) rendering, patent issues
+.if !empty(PKG_OPTIONS:Msubpixel)
+CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
+.endif
+
+.if !empty(PKG_OPTIONS:Mpng)
+CONFIGURE_ARGS+= --with-png=yes
+.include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --with-png=no
+.endif