Attachment 216772 Details for Bug 248272 – v1

[patch] v1

bug248272.diff (text/plain), 5.02 KB, created by Jan Beich on 2020-07-26 07:49:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-07-26 07:49:50 UTC

Size: 5.02 KB

patch

obsolete

>From 26cd5ebbb5616ad3ec87c7850742b97c05b0d76a Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 26 Jul 2020 04:53:46 +0000
>Subject: [PATCH] graphics/ftgl: update to 2.4.0 (new upstream)
>
>Changes:	https://github.com/frankheckenbach/ftgl/blob/v2.4.0/NEWS
>Changes:	https://github.com/frankheckenbach/ftgl/compare/03663110fdec...v2.4.0
>PR:		248272
>Approved by:	?
>---
> graphics/ftgl/Makefile               | 18 ++++++++----------
> graphics/ftgl/distinfo               |  5 +++--
> graphics/ftgl/files/patch-configure  | 11 -----------
> graphics/ftgl/files/patch-m4_font.m4 | 11 +++++++++++
> graphics/ftgl/pkg-descr              |  2 +-
> graphics/ftgl/pkg-plist              |  5 ++++-
> 6 files changed, 27 insertions(+), 25 deletions(-)
> delete mode 100644 graphics/ftgl/files/patch-configure
> create mode 100644 graphics/ftgl/files/patch-m4_font.m4
>
>diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile
>index b408b6c06bba..e142c6856406 100644
>--- a/graphics/ftgl/Makefile
>+++ b/graphics/ftgl/Makefile
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	ftgl
>-DISTVERSION=	2.1.3-rc5
>-PORTREVISION=	6
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.4.0
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/FTGL%20Source/2.1.3%7Erc5
>@@ -19,18 +19,16 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-gl-inc="${LOCALBASE}/include" \
> 		--without-glut-inc
>-USES=		gl pathfix gmake libtool xorg
>+USES=		autoreconf gl pathfix gmake libtool pkgconfig xorg
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	frankheckenbach
> USE_GL=		gl glu
>-USE_XORG=	x11 xext xmu
>+USE_XORG=	ice sm x11 xext xmu
> USE_LDCONFIG=	yes
>-
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-/~/}
>+INSTALL_TARGET=	install-strip
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/SUBDIRS/ s|docs||; /SUBDIRS/ s|demo||' \
>-		${WRKSRC}/Makefile.in
>-
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libftgl.so
>+		${WRKSRC}/Makefile.am
> 
> .include <bsd.port.mk>
>diff --git a/graphics/ftgl/distinfo b/graphics/ftgl/distinfo
>index 4f5890d52267..57a73b7aa229 100644
>--- a/graphics/ftgl/distinfo
>+++ b/graphics/ftgl/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (ftgl-2.1.3-rc5.tar.gz) = 5458d62122454869572d39f8aa85745fc05d5518001bcefa63bd6cbb8d26565b
>-SIZE (ftgl-2.1.3-rc5.tar.gz) = 841597
>+TIMESTAMP = 1475810942
>+SHA256 (frankheckenbach-ftgl-v2.4.0_GH0.tar.gz) = aa97da1c3442a8fd3941037655df18016d70b5266381c81d81e8b5335f196ea8
>+SIZE (frankheckenbach-ftgl-v2.4.0_GH0.tar.gz) = 630803
>diff --git a/graphics/ftgl/files/patch-configure b/graphics/ftgl/files/patch-configure
>deleted file mode 100644
>index 450a02f34335..000000000000
>--- a/graphics/ftgl/files/patch-configure
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- configure.orig	2019-09-25 00:59:19 UTC
>-+++ configure
>-@@ -23739,7 +23739,7 @@ GLUT_X_LIBS=
>- { echo "$as_me:$LINENO: checking for a TrueType font on the system" >&5
>- echo $ECHO_N "checking for a TrueType font on the system... $ECHO_C" >&6; }
>- 
>--FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*\file:[^"]*"$[^"]*$".*/\1/p' | sed q`"
>-+FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*file:[^"]*"$[^"]*$".*/\1/p' | sed q`"
>- 
>- if test "$FONT_FILE" = ""; then
>-     for font in \
>diff --git a/graphics/ftgl/files/patch-m4_font.m4 b/graphics/ftgl/files/patch-m4_font.m4
>new file mode 100644
>index 000000000000..e06e96d4483a
>--- /dev/null
>+++ b/graphics/ftgl/files/patch-m4_font.m4
>@@ -0,0 +1,11 @@
>+--- m4/font.m4.orig	2019-02-07 21:39:58 UTC
>++++ m4/font.m4
>+@@ -11,7 +11,7 @@ AC_DEFUN([FTGL_CHECK_FONT],
>+ AC_MSG_CHECKING(for a TrueType font on the system)
>+ 
>+ dnl  First try: fontconfig
>+-FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*\file:@<:@^"@:>@*"$@<:@^"@:>@*$".*/\1/p' | sed q`"
>++FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*file:@<:@^"@:>@*"$@<:@^"@:>@*$".*/\1/p' | sed q`"
>+ 
>+ dnl  Second try: look into known paths
>+ if test "$FONT_FILE" = ""; then
>diff --git a/graphics/ftgl/pkg-descr b/graphics/ftgl/pkg-descr
>index 2013a952c45a..b39668e7e8aa 100644
>--- a/graphics/ftgl/pkg-descr
>+++ b/graphics/ftgl/pkg-descr
>@@ -6,4 +6,4 @@ format. FTGL uses the Freetype (www.freetype.org) font library to open and
> 'decode' the fonts. It then takes that output and stores it in a format
> most efficient for OpenGL rendering.
> 
>-WWW: https://sourceforge.net/projects/ftgl/
>+WWW: https://github.com/frankheckenbach/ftgl
>diff --git a/graphics/ftgl/pkg-plist b/graphics/ftgl/pkg-plist
>index 440524e07722..f50262b18184 100644
>--- a/graphics/ftgl/pkg-plist
>+++ b/graphics/ftgl/pkg-plist
>@@ -11,17 +11,20 @@ include/FTGL/FTGLOutlineFont.h
> include/FTGL/FTGLPixmapFont.h
> include/FTGL/FTGLPolygonFont.h
> include/FTGL/FTGLTextureFont.h
>+include/FTGL/FTGLTriangleExtractorFont.h
> include/FTGL/FTGlyph.h
> include/FTGL/FTLayout.h
>+include/FTGL/FTLibrary.h
> include/FTGL/FTOutlineGlyph.h
> include/FTGL/FTPixmapGlyph.h
> include/FTGL/FTPoint.h
> include/FTGL/FTPolyGlyph.h
> include/FTGL/FTSimpleLayout.h
> include/FTGL/FTTextureGlyph.h
>+include/FTGL/FTTriangleExtractorGlyph.h
> include/FTGL/ftgl.h
> lib/libftgl.a
> lib/libftgl.so
> lib/libftgl.so.2
>-lib/libftgl.so.2.1.3
>+lib/libftgl.so.2.4.0
> libdata/pkgconfig/ftgl.pc

Actions: View | Diff

Attachments on bug 248272: 216772