diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 05dd27b29722..68c882e75554 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -1,34 +1,34 @@ PORTNAME= ftgl DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org COMMENT= OpenGL FreeType fonts rendering library WWW= https://github.com/frankheckenbach/ftgl LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 USE_GITHUB= yes GH_ACCOUNT= frankheckenbach USES= autoreconf compiler:c++11-lang gl pathfix gmake libtool \ pkgconfig xorg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gl-inc="${LOCALBASE}/include" \ --without-glut-inc USE_GL= gl glu USE_XORG= ice sm x11 xext xmu USE_LDCONFIG= yes INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} -e '/SUBDIRS/ s|docs||; /SUBDIRS/ s|demo||' \ ${WRKSRC}/Makefile.am .include diff --git a/graphics/ftgl/files/patch-src_FTContour.cpp b/graphics/ftgl/files/patch-src_FTContour.cpp new file mode 100644 index 000000000000..082720cd1ca7 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTContour.cpp @@ -0,0 +1,11 @@ +--- src/FTContour.cpp.orig 2019-02-07 21:39:58 UTC ++++ src/FTContour.cpp +@@ -174,7 +174,7 @@ void FTContour::SetParity(int parity) + } + + +-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n) ++FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n) + { + FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]); + double olddir, dir = atan2((next - cur).Y(), (next - cur).X()); diff --git a/graphics/ftgl/files/patch-src_FTContour.h b/graphics/ftgl/files/patch-src_FTContour.h new file mode 100644 index 000000000000..8b8423e7c1b7 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTContour.h @@ -0,0 +1,11 @@ +--- src/FTContour.h.orig 2019-02-07 21:39:58 UTC ++++ src/FTContour.h +@@ -52,7 +52,7 @@ class FTContour + * @param pointTags + * @param numberOfPoints + */ +- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints); ++ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints); + + /** + * Destructor diff --git a/graphics/ftgl/files/patch-src_FTVectoriser.cpp b/graphics/ftgl/files/patch-src_FTVectoriser.cpp new file mode 100644 index 000000000000..373eb4c7bfa3 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTVectoriser.cpp @@ -0,0 +1,11 @@ +--- src/FTVectoriser.cpp.orig 2019-02-07 21:39:58 UTC ++++ src/FTVectoriser.cpp +@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ unsigned char* tagList = &outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1;