From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 07:39:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62D776665D7; Sat, 7 Aug 2021 07:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GhZ3m1l2Rz4n9w; Sat, 7 Aug 2021 07:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 246BD1D3EB; Sat, 7 Aug 2021 07:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1777dG4L016424; Sat, 7 Aug 2021 07:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1777dG3v016423; Sat, 7 Aug 2021 07:39:16 GMT (envelope-from git) Date: Sat, 7 Aug 2021 07:39:16 GMT Message-Id: <202108070739.1777dG3v016423@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: e88dd7a0da54 - main - graphics/ocaml-images: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e88dd7a0da54b2f31e635c5da8988862de23ca13 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 07:39:16 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e88dd7a0da54b2f31e635c5da8988862de23ca13 commit e88dd7a0da54b2f31e635c5da8988862de23ca13 Author: Tobias C. Berner AuthorDate: 2021-08-07 07:19:19 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 07:30:08 +0000 graphics/ocaml-images: prepare for freetype2 update - freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512 --- graphics/ocaml-images/Makefile | 3 +++ graphics/ocaml-images/files/patch-OMakefile | 23 ++++++++++++++++++++--- graphics/ocaml-images/files/patch-configure | 13 +++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 3c6141de4719..d6405e47b9c0 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -51,6 +51,7 @@ XPM_CONFIGURE_WITH= xpm GIF_CONFIGURE_WITH= gif GIF_LIB_DEPENDS= libgif.so:graphics/giflib +FREETYPE_USES= pkgconfig FREETYPE_CONFIGURE_WITH=freetype FREETYPE_LIB_DEPENDS= libttf.so:print/freetype \ libfreetype.so:print/freetype2 @@ -62,6 +63,8 @@ GTK2_CONFIGURE_WITH= liblgtk2 GTK2_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 GTK2_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 +BINARY_ALIAS= freetype-config=true + .include .if ${PORT_OPTIONS:MXPM} diff --git a/graphics/ocaml-images/files/patch-OMakefile b/graphics/ocaml-images/files/patch-OMakefile index 469d16c417d5..3fe0f16e9845 100644 --- a/graphics/ocaml-images/files/patch-OMakefile +++ b/graphics/ocaml-images/files/patch-OMakefile @@ -1,6 +1,6 @@ ---- OMakefile.orig 2012-11-07 22:03:19.000000000 +0100 -+++ OMakefile 2012-11-07 22:04:26.000000000 +0100 -@@ -22,13 +22,13 @@ +--- OMakefile.orig 2011-06-22 18:04:32 UTC ++++ OMakefile +@@ -22,13 +22,13 @@ if $(defined WithOMyApt) # Specify non standard include directories INCLUDES[]= @@ -18,3 +18,20 @@ # Specify directories where X's rgb.txt can be found PATH_RGB_TXT[]= +@@ -175,13 +175,13 @@ print_configured() = + OCAMLPACKS+=graphics + export + +- SUPPORT_FREETYPE = $(Check_prog_in_path freetype-config) ++ SUPPORT_FREETYPE = $(Check_prog_in_path pkg-config) + PATH_FREETYPE_CONFIG = $(WHERE) + LDFLAGS_freetype= + if $(SUPPORT_FREETYPE) + println(SUPPORT_FREETYPE=$(SUPPORT_FREETYPE)!) +- CFLAGS= $(CFLAGS) $(shell freetype-config --cflags) +- LDFLAGS_freetype= $(shell freetype-config --libs) ++ CFLAGS= $(CFLAGS) $(shell pkg-config freetype2 --cflags) ++ LDFLAGS_freetype= $(shell pkg-config freetype2 --libs) + export + if $(SUPPORT_FREETYPE) + SUPPORTED_NON_FORMATS+=freetype diff --git a/graphics/ocaml-images/files/patch-configure b/graphics/ocaml-images/files/patch-configure new file mode 100644 index 000000000000..224ee1fca92e --- /dev/null +++ b/graphics/ocaml-images/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2021-08-07 07:17:08 UTC ++++ configure +@@ -8108,8 +8108,8 @@ fi + + + if test -n "$FREETYPE_CONFIG"; then +- LIBFREETYPE=`freetype-config --libs` +- INCFREETYPE=`freetype-config --cflags` ++ LIBFREETYPE=`pkg-config freetype2 --libs` ++ INCFREETYPE=`pkg-config freetype2 --cflags` + SUPPORT_FREETYPE="true" + fi + fi