Index: head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt =================================================================== --- head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt (revision 403473) +++ head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt (revision 403474) @@ -1,11 +1,11 @@ ---- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig 2013-12-24 21:48:53.000000000 +0200 -+++ plugins/zynaddsubfx/fltk/CMakeLists.txt 2013-12-24 21:49:16.000000000 +0200 -@@ -165,7 +165,7 @@ - mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) - - # where to find freetype headers --find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) -+find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2) - if(FREETYPE_PATH) - include_directories(${FREETYPE_PATH}) - endif(FREETYPE_PATH) +--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig 2013-06-11 17:46:42.000000000 +0200 ++++ plugins/zynaddsubfx/fltk/CMakeLists.txt 2015-10-21 10:24:19.901416000 +0200 +@@ -139,7 +139,7 @@ + find_file(HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h) + find_file(HAVE_DIRENT_H dirent.h) + find_file(HAVE_DLFCN_H dlfcn.h) +-find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2) ++find_file(HAVE_FREETYPE_H ft2build.h PATH_SUFFIXES freetype2) + find_file(HAVE_GL_GL_H GL/gl.h) + find_file(HAVE_GL_GLU_H GL/glu.h) + find_file(HAVE_LIBPNG_PNG_H libpng/png.h) Index: head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake =================================================================== --- head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake (revision 403473) +++ head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake (revision 403474) @@ -1,20 +1,11 @@ --- cmake/FindFreetype2.cmake.orig 2013-12-24 19:02:55.000000000 +0100 +++ cmake/FindFreetype2.cmake 2013-12-24 19:03:21.000000000 +0100 -@@ -52,7 +52,7 @@ - # - - --FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h -+FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h - ${ADDITIONAL_INCLUDE_PATH} - /usr/include - /usr/include/freetype2 @@ -67,7 +67,7 @@ NO_DEFAULT_PATH ) -FIND_PATH(FREETYPE2_FT2BUILD ft2build.h +FIND_PATH(FREETYPE2_FT2BUILD freetype2/ft2build.h ${ADDITIONAL_INCLUDE_PATH} /usr/include /usr/X11/include Index: head/graphics/xpaint/Makefile =================================================================== --- head/graphics/xpaint/Makefile (revision 403473) +++ head/graphics/xpaint/Makefile (revision 403474) @@ -1,48 +1,47 @@ # Created by: Steven Wallace # $FreeBSD$ PORTNAME= xpaint PORTVERSION= 2.9.10.3 PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= johans@FreeBSD.org COMMENT= Simple paint program LICENSE= GPLv3 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft RUN_DEPENDS= psselect:${PORTSDIR}/print/psutils \ bash:${PORTSDIR}/shells/bash USE_XORG= xft xmu xpm GNU_CONFIGURE= yes -USES= ghostscript:run jpeg libtool:build shebangfix tar:bzip2 +USES= ghostscript:run jpeg libtool:build pkgconfig shebangfix \ + tar:bzip2 SHEBANG_FILES= share/bin/imgmerge share/bin/xpaint_ocr -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ - -I${LOCALBASE}/include/freetype2/freetype +CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib MAKE_ENV+= RM="${RM} -f" post-patch: @${RM} -f ${WRKSRC}/XPaint.ad @${REINPLACE_CMD} -e 's/-ldl //' \ - -e 's|freetype/||g' \ ${WRKSRC}/configure ${WRKSRC}/rw/configure @${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \ -e '/^install-exec-am:/s/install-libLTLIBRARIES//' \ ${WRKSRC}/rw/Makefile.in @${REINPLACE_CMD} -e '/if (!image)/s/return;/return -1;/' \ ${WRKSRC}/rw/readWriteTGA.c post-configure: ${MAKE} -C ${WRKSRC} clean .include Index: head/graphics/xpaint/files/patch-configure =================================================================== --- head/graphics/xpaint/files/patch-configure (nonexistent) +++ head/graphics/xpaint/files/patch-configure (revision 403474) @@ -0,0 +1,11 @@ +--- configure.orig 2015-12-03 20:52:59.771668000 +0100 ++++ configure 2015-12-03 20:53:09.226361000 +0100 +@@ -5611,7 +5611,7 @@ + $as_echo_n "checking location of freetype2 headers... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + int + main () + { Property changes on: head/graphics/xpaint/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/xpaint/files/patch-rw_configure =================================================================== --- head/graphics/xpaint/files/patch-rw_configure (nonexistent) +++ head/graphics/xpaint/files/patch-rw_configure (revision 403474) @@ -0,0 +1,11 @@ +--- rw/configure.orig 2015-12-03 20:56:32.251228000 +0100 ++++ rw/configure 2015-12-03 20:56:55.905547000 +0100 +@@ -11691,7 +11691,7 @@ + $as_echo_n "checking location of freetype2 headers... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + int + main () + { Property changes on: head/graphics/xpaint/files/patch-rw_configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/Makefile =================================================================== --- head/misc/magicpoint/Makefile (revision 403473) +++ head/misc/magicpoint/Makefile (revision 403474) @@ -1,103 +1,105 @@ # Created by: itojun@itojun.org # $FreeBSD$ PORTNAME= magicpoint PORTVERSION= 1.13a PORTREVISION= 18 CATEGORIES?= misc MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ MAINTAINER= dinoex@FreeBSD.org COMMENT= X11-based presentation tool +BROKEN= Doesn't build with freetype2 2.6.1 or higher + LICENSE= BSD3CLAUSE LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libmng.so:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm MAKE_JOBS_UNSAFE= yes USES= imake:env perl5 pkgconfig USE_PERL5= run USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-vflib --enable-locale CONFIGURE_ENV= mgp_cv_path_perl=${PERL} CPPFLAGS+= -I.. LATE_INSTALL_ARGS= install.man PORTDOCS= ${DOCS} sample emacs-lisp scripts DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \ README.fonts.jp README.lang RELNOTES SYNTAX TODO.jp \ USAGE USAGE.jp SAMPLES= README README.jp cloud.jpg dad.eps dad.jpg default.mgp \ embed-jp.mgp embed.mgp gradation-jp.mgp \ gradation.mgp mgp-old1.jpg mgp-old2.jpg mgp-old3.jpg \ mgp.mng mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm mgprc-sample \ multilingual.mgp sample-fr.mgp sample-jp.mgp sample.mgp \ sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \ tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg EMACS_LISPS= mgp-mode.el EMACS_LISPS_MGP=COPYING README mgp.el mgp.sty sample.tex SAMPLE_SCRIPTS= eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl OPTIONS_DEFINE= FREETYPE XFT GIF DOCS OPTIONS_DEFAULT=FREETYPE XFT GIF NO_OPTIONS_SORT=yes FREETYPE_CONFIGURE_ENABLE= freetype XFT_USES= iconv XFT_USE= XORG=xft XFT_LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype XFT_CONFIGURE_ENABLE= xft2 XFT_CONFIGURE_ON= --enable-freetype-charset16 GIF_CONFIGURE_ENABLE= gif GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CPPFLAGS= -I${LOCALBASE}/include post-patch: ${REINPLACE_CMD} -e 's|-lungif|-lgif|' \ -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ ${WRKSRC}/configure post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS} cd ${WRKSRC}/contrib/xmindpath && \ ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} ${REINPLACE_CMD} -e 's|freetype1/freetype|freetype1|g' \ ${WRKSRC}/Makefile ${WRKSRC}/image/Makefile post-build: cd ${WRKSRC}/contrib/xmindpath && \ ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: ${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \ ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \ ${STAGEDIR}${PREFIX}/bin/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && \ ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/sample cd ${WRKSRC}/sample && \ ${INSTALL_DATA} ${SAMPLES} ${STAGEDIR}${DOCSDIR}/sample/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp cd ${WRKSRC}/contrib && \ ${INSTALL_DATA} ${EMACS_LISPS} \ ${STAGEDIR}${DOCSDIR}/emacs-lisp/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el cd ${WRKSRC}/contrib/mgp-el && \ ${INSTALL_DATA} ${EMACS_LISPS_MGP} \ ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts cd ${WRKSRC}/contrib && \ ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} \ ${STAGEDIR}${DOCSDIR}/scripts/ .include Index: head/multimedia/ffmpeg0/Makefile =================================================================== --- head/multimedia/ffmpeg0/Makefile (revision 403473) +++ head/multimedia/ffmpeg0/Makefile (revision 403474) @@ -1,382 +1,381 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 0.7.17 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 0 MAINTAINER= wg@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html PORTSCOUT= limit:^0\.7.* USES= cpe gmake perl5 pkgconfig tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build FFMPEG_SUFFIX= 0 HAS_CONFIGURE= yes CONFIGURE_LOG= config.err CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" PROGS= ffmpeg ffprobe CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --datadir="${DATADIR}" \ --build-suffix="${FFMPEG_SUFFIX}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ --enable-runtime-cpudetect \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="-lpthread" SHLIB_VER= 1 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \ FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \ OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \ THEORA VORBIS VPX X264 XVID OPTIONS_SUB= yes FFSERVER_DESC= Build and install ffserver X11GRAB_DESC= Enable x11 grabbing ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_OFF= --disable-indev=alsa \ --disable-outdev=alsa CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt CELT_CONFIGURE_ENABLE= libcelt DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac DIRAC_CONFIGURE_ENABLE= libdirac DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug FFSERVER_CONFIGURE_OFF= --disable-ffserver FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg RTMP_USE= OPENSSL=yes SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora X11GRAB_USE= XORG=x11,xext,xfixes X11GRAB_CONFIGURE_ON= --enable-x11grab X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/opt.h \ libavcodec/vdpau.h \ libavcodec/xvmc.h \ libavdevice/avdevice.h \ libavfilter/avfilter.h \ libavformat/avformat.h \ libavformat/avio.h \ libavutil/adler32.h \ libavutil/avstring.h \ libavutil/avutil.h \ libavutil/base64.h \ libavutil/common.h \ libavutil/crc.h \ libavutil/fifo.h \ libavutil/intfloat_readwrite.h \ libavutil/log.h \ libavutil/lzo.h \ libavutil/mathematics.h \ libavutil/md5.h \ libavutil/mem.h \ libavutil/pixfmt.h \ libavutil/rational.h \ libavutil/sha1.h \ libpostproc/postprocess.h \ libswscale/swscale.h .include .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS+= -no-integrated-as .endif DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE # under doc subdirectory DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html .if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver${FFMPEG_SUFFIX} PROGS+= ffserver .endif # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") _BUILTIN_VECTOR= yes .else CONFIGURE_ARGS+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" CONFIGURE_ARGS+= --disable-mmx _NO_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR) CFLAGS+= -msse .endif # optimizations .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif #aacplus .if ${PORT_OPTIONS:MAACPLUS} FFMPEG_NONFREE= yes LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus CONFIGURE_ARGS+= --enable-libaacplus .else CONFIGURE_ARGS+= --disable-libaacplus .endif # Opencore AMR NB .if ${PORT_OPTIONS:MAMR_NB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif # Opencore AMR WB .if ${PORT_OPTIONS:MAMR_WB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # faac .if ${PORT_OPTIONS:MFAAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac .else CONFIGURE_ARGS+= --disable-libfaac .endif # rtmp .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp CONFIGURE_ARGS+= --enable-librtmp . if ${OPENSSLBASE} != "/usr" FFMPEG_CFLAGS+= -I${OPENSSLINC} FFMPEG_LDFLAGS+= -L${OPENSSLLIB} . endif .else CONFIGURE_ARGS+= --disable-librtmp .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz PROGS+= ffplay .else CONFIGURE_ARGS+= --disable-ffplay .endif # vaapi .if ${PORT_OPTIONS:MVAAPI} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva CONFIGURE_ARGS+= --enable-vaapi .else CONFIGURE_ARGS+= --disable-vaapi .endif # vo-aacenc .if ${PORT_OPTIONS:MVO_AACENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc CONFIGURE_ARGS+= --enable-libvo-aacenc .else CONFIGURE_ARGS+= --disable-libvo-aacenc .endif # vo-amrwbenc .if ${PORT_OPTIONS:MVO_AMRWBENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc CONFIGURE_ARGS+= --enable-libvo-amrwbenc .else CONFIGURE_ARGS+= --disable-libvo-amrwbenc .endif # vorbis .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbisenc.so:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis .else CONFIGURE_ARGS+= --disable-libvorbis .endif # License knobs .if defined(FFMPEG_NONFREE) RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) LICENSE+= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/subdir.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ - -e 's|freetype/freetype.h|freetype.h|g' \ -e 's|check_ldflags -Wl,--as-needed||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/print/freetype2/Makefile =================================================================== --- head/print/freetype2/Makefile (revision 403473) +++ head/print/freetype2/Makefile (revision 403474) @@ -1,50 +1,49 @@ # Created by: jseger@FreeBSD.org # $FreeBSD$ PORTNAME= freetype2 -PORTVERSION= 2.6 -PORTREVISION= 1 +PORTVERSION= 2.6.2 CATEGORIES= print MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \ SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \ http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \ ftp://ftp.freetype.org/freetype/freetype2/ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Free and portable TrueType font rendering engine USES= cpe gmake libtool tar:bzip2 MAKE_ENV= TOP="" USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-harfbuzz CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix CPE_PRODUCT= freetype CPE_VENDOR= freetype OPTIONS_DEFINE= LCD_FILTERING PNG OPTIONS_DEFAULT= LCD_FILTERING LCD_FILTERING_DESC?= Sub-pixel rendering (patented) PNG_DESC= Png compressed OpenType embedded bitmaps support LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_OFF= --without-png pre-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/builds/unix/install.mk post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.* .include Index: head/print/freetype2/distinfo =================================================================== --- head/print/freetype2/distinfo (revision 403473) +++ head/print/freetype2/distinfo (revision 403474) @@ -1,2 +1,2 @@ -SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e -SIZE (freetype-2.6.tar.bz2) = 1726219 +SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 +SIZE (freetype-2.6.2.tar.bz2) = 1767940 Index: head/print/freetype2/files/patch-5cd2155 =================================================================== --- head/print/freetype2/files/patch-5cd2155 (revision 403473) +++ head/print/freetype2/files/patch-5cd2155 (nonexistent) @@ -1,163 +0,0 @@ -Revert commit below to fix cut off text - -https://savannah.nongnu.org/bugs/?45520 - -From 5cd21551131ef3a9690ecbefcc9782286ee5199e Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Fri, 10 Apr 2015 05:01:01 +0000 -Subject: [cff] Update advance width handling to OpenType 1.7. - -Problem reported by Behdad. - -* src/cff/cffdrivr.c (cff_get_advances): Handle SFNT case -separately. - -* src/cff/cffgload.c (cff_slot_load): Use advance width and side -bearing values from `hmtx' table if present. ---- - ---- src/cff/cffdrivr.c.orig 2015-04-28 09:15:13.000000000 +0200 -+++ src/cff/cffdrivr.c 2015-07-25 17:42:23.025572000 +0200 -@@ -195,68 +195,6 @@ - FT_GlyphSlot slot = face->glyph; - - -- if ( FT_IS_SFNT( face ) ) -- { -- /* OpenType 1.7 mandates that the data from `hmtx' table be used; */ -- /* it is no longer necessary that those values are identical to */ -- /* the values in the `CFF' table */ -- -- TT_Face ttface = (TT_Face)face; -- FT_Short dummy; -- -- -- if ( flags & FT_LOAD_VERTICAL_LAYOUT ) -- { -- /* check whether we have data from the `vmtx' table at all; */ -- /* otherwise we extract the info from the CFF glyphstrings */ -- /* (instead of synthesizing a global value using the `OS/2' */ -- /* table) */ -- if ( !ttface->vertical_info ) -- goto Missing_Table; -- -- for ( nn = 0; nn < count; nn++ ) -- { -- FT_UShort ah; -- -- -- ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface, -- 1, -- start + nn, -- &dummy, -- &ah ); -- -- FT_TRACE5(( " idx %d: advance height %d font units\n", -- start + nn, ah )); -- advances[nn] = ah; -- } -- } -- else -- { -- /* check whether we have data from the `hmtx' table at all */ -- if ( !ttface->horizontal.number_Of_HMetrics ) -- goto Missing_Table; -- -- for ( nn = 0; nn < count; nn++ ) -- { -- FT_UShort aw; -- -- -- ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface, -- 0, -- start + nn, -- &dummy, -- &aw ); -- -- FT_TRACE5(( " idx %d: advance width %d font units\n", -- start + nn, aw )); -- advances[nn] = aw; -- } -- } -- -- return error; -- } -- -- Missing_Table: - flags |= (FT_UInt32)FT_LOAD_ADVANCE_ONLY; - - for ( nn = 0; nn < count; nn++ ) ---- src/cff/cffgload.c.orig 2015-04-16 07:02:23.000000000 +0200 -+++ src/cff/cffgload.c 2015-07-25 17:42:23.027008000 +0200 -@@ -2725,7 +2725,7 @@ - face->vertical_info && - face->vertical.number_Of_VMetrics > 0 ); - -- /* get the vertical metrics from the vmtx table if we have one */ -+ /* get the vertical metrics from the vtmx table if we have one */ - if ( has_vertical_info ) - { - (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1, -@@ -2953,43 +2953,25 @@ - FT_Bool has_vertical_info; - - -- if ( face->horizontal.number_Of_HMetrics ) -- { -- FT_Short horiBearingX = 0; -- FT_UShort horiAdvance = 0; -- -- -- ( (SFNT_Service)face->sfnt )->get_metrics( face, 0, -- glyph_index, -- &horiBearingX, -- &horiAdvance ); -- metrics->horiAdvance = horiAdvance; -- metrics->horiBearingX = horiBearingX; -- glyph->root.linearHoriAdvance = horiAdvance; -- } -- else -- { -- /* copy the _unscaled_ advance width */ -- metrics->horiAdvance = decoder.glyph_width; -- glyph->root.linearHoriAdvance = decoder.glyph_width; -- } -- -+ /* copy the _unscaled_ advance width */ -+ metrics->horiAdvance = decoder.glyph_width; -+ glyph->root.linearHoriAdvance = decoder.glyph_width; - glyph->root.internal->glyph_transformed = 0; - - has_vertical_info = FT_BOOL( face->vertical_info && - face->vertical.number_Of_VMetrics > 0 ); - -- /* get the vertical metrics from the vmtx table if we have one */ -+ /* get the vertical metrics from the vtmx table if we have one */ - if ( has_vertical_info ) - { - FT_Short vertBearingY = 0; - FT_UShort vertAdvance = 0; - - -- ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, -- glyph_index, -- &vertBearingY, -- &vertAdvance ); -+ (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1, -+ glyph_index, -+ &vertBearingY, -+ &vertAdvance ); - metrics->vertBearingY = vertBearingY; - metrics->vertAdvance = vertAdvance; - } -@@ -3064,9 +3046,7 @@ - metrics->width = cbox.xMax - cbox.xMin; - metrics->height = cbox.yMax - cbox.yMin; - -- if ( !face->horizontal.number_Of_HMetrics ) -- metrics->horiBearingX = cbox.xMin; -- -+ metrics->horiBearingX = cbox.xMin; - metrics->horiBearingY = cbox.yMax; - - if ( has_vertical_info ) Property changes on: head/print/freetype2/files/patch-5cd2155 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/freetype2/files/patch-builds_unix_detect.mk =================================================================== --- head/print/freetype2/files/patch-builds_unix_detect.mk (revision 403473) +++ head/print/freetype2/files/patch-builds_unix_detect.mk (revision 403474) @@ -1,30 +1,26 @@ ---- builds/unix/detect.mk.orig 2015-03-11 01:47:10.000000000 -0400 -+++ builds/unix/detect.mk 2015-06-16 05:45:17.176216000 -0400 +--- builds/unix/detect.mk.orig 2015-09-25 07:58:57.000000000 +0200 ++++ builds/unix/detect.mk 2015-10-04 12:35:05.733855000 +0200 @@ -22,6 +22,9 @@ $(wildcard /usr/sbin/init) \ $(wildcard /dev/null) \ $(wildcard /hurd/auth)) + # FreeBSD is "unix" so just mandate this to fix the build in + # jails that do not have init (see PR#113470). + is_unix := true ifneq ($(is_unix),) PLATFORM := unix -@@ -81,12 +84,12 @@ +@@ -80,10 +83,10 @@ ifdef must_configure ifneq ($(have_Makefile),) # we are building FT2 not in the src tree -- CONFIG_SHELL="$(CONFIG_SHELL)" \ -- $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG) -+# CONFIG_SHELL="$(CONFIG_SHELL)" \ -+# $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG) +- $(TOP_DIR)/builds/unix/configure $(value CFG) ++# $(TOP_DIR)/builds/unix/configure $(value CFG) else - cd builds/unix; \ -- CONFIG_SHELL="$(CONFIG_SHELL)" \ -- $(CONFIG_SHELL) ./configure $(value CFG) +- ./configure $(value CFG) +# cd builds/unix; \ -+# CONFIG_SHELL="$(CONFIG_SHELL)" \ -+# $(CONFIG_SHELL) ./configure $(value CFG) ++# ./configure $(value CFG) endif endif Index: head/print/freetype2/pkg-plist =================================================================== --- head/print/freetype2/pkg-plist (revision 403473) +++ head/print/freetype2/pkg-plist (revision 403474) @@ -1,59 +1,59 @@ bin/freetype-config -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/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/ftfntfmt.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/ftttdrv.h +include/freetype2/freetype/fttypes.h +include/freetype2/freetype/ftwinfnt.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/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/ftfntfmt.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/t1tables.h -include/freetype2/ttnameid.h -include/freetype2/tttables.h -include/freetype2/tttags.h -include/freetype2/ttunpat.h lib/libfreetype.a lib/libfreetype.so lib/libfreetype.so.6 -lib/libfreetype.so.6.12.0 +lib/libfreetype.so.6.12.2 libdata/pkgconfig/freetype2.pc man/man1/freetype-config.1.gz share/aclocal/freetype2.m4 Index: head/www/firefox/files/patch-1194520 =================================================================== --- head/www/firefox/files/patch-1194520 (nonexistent) +++ head/www/firefox/files/patch-1194520 (revision 403474) @@ -0,0 +1,35 @@ +From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Fri, 14 Aug 2015 08:50:38 +0900 +Subject: [PATCH] Bug 1194520 - Add a system header wrapper for + + +--- + config/system-headers | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/system-headers b/config/system-headers +index bee35da..ad1f88d 100644 +--- config/system-headers ++++ config/system-headers +@@ -450,16 +450,17 @@ foundation/base64.h + foundation/hexdump.h + #endif + fp.h + fpieee.h + frame/log.h + frame/req.h + freetype/freetype.h + freetype/ftcache.h ++freetype/ftfntfmt.h + freetype/ftglyph.h + freetype/ftsynth.h + freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h +-- +2.5.0.3.ge81d485 + Property changes on: head/www/firefox/files/patch-1194520 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/seamonkey/files/patch-1194520 =================================================================== --- head/www/seamonkey/files/patch-1194520 (nonexistent) +++ head/www/seamonkey/files/patch-1194520 (revision 403474) @@ -0,0 +1,35 @@ +From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Fri, 14 Aug 2015 08:50:38 +0900 +Subject: [PATCH] Bug 1194520 - Add a system header wrapper for + + +--- + config/system-headers | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/system-headers b/config/system-headers +index bee35da..ad1f88d 100644 +--- mozilla/config/system-headers ++++ mozilla/config/system-headers +@@ -450,16 +450,17 @@ foundation/base64.h + foundation/hexdump.h + #endif + fp.h + fpieee.h + frame/log.h + frame/req.h + freetype/freetype.h + freetype/ftcache.h ++freetype/ftfntfmt.h + freetype/ftglyph.h + freetype/ftsynth.h + freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h +-- +2.5.0.3.ge81d485 + Property changes on: head/www/seamonkey/files/patch-1194520 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/xfe/files/patch-configure =================================================================== --- head/x11-fm/xfe/files/patch-configure (nonexistent) +++ head/x11-fm/xfe/files/patch-configure (revision 403474) @@ -0,0 +1,11 @@ +--- configure.orig 2015-10-21 16:59:07.344253000 +0200 ++++ configure 2015-10-21 16:59:18.245643000 +0200 +@@ -14940,7 +14940,7 @@ + LIBS="$LIBS $freetype_libs" + CPPFLAGS="$freetype_cflags $CPPFLAGS" + fi +- ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default" ++ ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default" + if test "x$ac_cv_header_config_ftheader_h" = xyes; then : + + else Property changes on: head/x11-fm/xfe/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake =================================================================== --- head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake (revision 403473) +++ head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake (revision 403474) @@ -1,22 +1,17 @@ ---- cmake/modules/FREETYPEConfig.cmake.orig 2008-04-07 23:45:10.000000000 +0300 -+++ cmake/modules/FREETYPEConfig.cmake 2013-12-23 19:53:13.000000000 +0200 -@@ -1,14 +1,14 @@ +--- cmake/modules/FREETYPEConfig.cmake.orig 2008-04-07 22:45:10.000000000 +0200 ++++ cmake/modules/FREETYPEConfig.cmake 2015-12-02 14:40:47.871063000 +0100 +@@ -1,10 +1,10 @@ # # Find the native FREETYPE includes and library # (from Scribus) - FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h - /usr/include/ - /usr/local/include/ - /usr/X11R6/include/ + FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h + /usr/include + /usr/local/include + /usr/X11R6/include NO_CMAKE_SYSTEM_PATH ) -- FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h -+ FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h - /usr/include/freetype2 - /usr/local/include/freetype2 - /usr/X11R6/include/freetype2