From nobody Sun Jan 16 13:55:14 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 50C421964BD5; Sun, 16 Jan 2022 13:55:15 +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 4JcGkq0g8Wz4Wp9; Sun, 16 Jan 2022 13:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642341315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpursfRnHQm6MpRUTfj8Bdq8SYEkwpb95iKSIDnCrNE=; b=QyHLELC8PkGucg6QQ9fcB9efSXww+UR+C62QOiZ4+Y0PCpMlKub//NEzO1pgDjJd6IqiSQ ctDdxt2MG9SHUV4K8Jer9nW4Nu4E09Y2LFnHRX60dMYca6Vy97H8fQfW2kkFtODDIKsYvj WBWUkQPxhefrHTu7ayZbf2lXjhhPARiVFpVUre8gCI4lkw/0geOyPfQyfGttHginI2PoYb 3IvlGf+c/N20NZ2S2+zebmR42pL+VyKRh37C/Gvt/G3ojxCFb4dEAtH0TRLKkB/dICSiUX 2AvC26jJmKKegQaKbGKvuhU/LzmsYqdGIJCnpRAiaiUPf0EayrrdBuVKZ/9XFg== 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 D689F1B94F; Sun, 16 Jan 2022 13:55:14 +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 20GDtEim093932; Sun, 16 Jan 2022 13:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GDtEOD093931; Sun, 16 Jan 2022 13:55:14 GMT (envelope-from git) Date: Sun, 16 Jan 2022 13:55:14 GMT Message-Id: <202201161355.20GDtEOD093931@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 6e009d045607 - main - print/ft2demos: Update to 2.11.1 and unbreak List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e009d045607bf5a838613fa0593ae41cae63c8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642341315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpursfRnHQm6MpRUTfj8Bdq8SYEkwpb95iKSIDnCrNE=; b=QxvIJu01v2s0jAGeMyJfzHjoPNiFUbnDM+d1tXLWEZ+99BMCt477LCazrpf32Tgqpsws7O c3tOJW1MDMPMxAlZD61yULYPkTBXKsV9n890/2YVcBXuE2/3jIrzjXY1V4sicqaOHbnAvM N/E7yLzTOVvPr9gJOgDYjh9vzTbRMDKwnmXWcwCgFESBIxE5G4JiOMlgcMQee5f9pOA3S2 1HYKNU0pAi24q/Go5j8tJ35th2/R3ApApqQWJEQErk6VMNpk1ifXuHoEqHw9hUtsgC7L3l fx8f1u+fx/m78Z+krsXfsKEFp4F0asJOgu17H9sCH1FSS1kAGiaSyloG2XWEKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642341315; a=rsa-sha256; cv=none; b=U+QmccL4bd4TUC/ggiszvAnCDlTMs3GJo+DwQ6BXXtLFyC8zbGuOP4ekT85j/fmaV7GeOw ZV08u4BdbSLNQJsQx11/S9QjXwy5Bn2KOprFrGQq8tICdp1JbjJJII6AMZdRK5mjBq2mNK bbyZnD8YqhFUqJ8Ne1gFoAl8Ao0HilD0EidcLcp5ajcN6apuaYDmTiQg+n9WZwrkq4Acjr SMXJOvojwgG1U88D4/1OuJsVLUrtGtf95kKy2uUD2boVVFPXUh/BInzl0g8p8UDQjM1rs8 S0x8jiqJSZcug2KSXymzahj0C7eN0LS5bdHrZ+dRK1G5whilZm56U0r/gg0WJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e009d045607bf5a838613fa0593ae41cae63c8b commit 6e009d045607bf5a838613fa0593ae41cae63c8b Author: Eric Gullufsen AuthorDate: 2022-01-16 13:50:01 +0000 Commit: Daniel Engberg CommitDate: 2022-01-16 13:50:14 +0000 print/ft2demos: Update to 2.11.1 and unbreak Convert to meson build system (from GNU Make) Use gitlab source which has meson.build PR: 260922 --- print/ft2demos/Makefile | 20 +++++++++++--------- print/ft2demos/distinfo | 6 +++--- print/ft2demos/files/patch-Makefile | 14 -------------- print/ft2demos/files/patch-meson.build | 11 +++++++++++ 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile index cc07936c3d94..d663dbf7d995 100644 --- a/print/ft2demos/Makefile +++ b/print/ft2demos/Makefile @@ -1,10 +1,10 @@ # Created by: KANOU Hiroki PORTNAME= ft2demos -PORTVERSION= 2.10.4 +PORTVERSION= 2.11.1 CATEGORIES= print -MASTER_SITES= SAVANNAH/freetype/ \ - SF/freetype/freetype-demos/${PORTVERSION} + +MASTER_SITES= https://gitlab.freedesktop.org MAINTAINER= ports@FreeBSD.org COMMENT= Demo programs for FreeType2 @@ -12,16 +12,17 @@ COMMENT= Demo programs for FreeType2 LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual -BROKEN= Doesn't build with FreeType 2.11.0 - BUILD_DEPENDS= ${NONEXISTENT}:print/freetype2:build LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png -USES= gmake tar:xz xorg +USES= meson tar:xz xorg USE_XORG= x11 -MAKE_ARGS= EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}" +USE_GITLAB= yes +GL_PROJECT= freetype-demos +GL_ACCOUNT= freetype +GL_COMMIT= 07027905d9a47664251b3ee362c5cfad1cddf86f PLIST_FILES= ${FT_PROGRAMS:S,^,bin/,} @@ -29,10 +30,11 @@ FT_PROGRAMS= ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \ ftmulti ftpatchk ftstring fttimer ftvalid ftview post-extract: - ${LN} -sf `${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC` ${WRKDIR}/freetype2 + ${LN} -sf `${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC` \ + ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}/subprojects/freetype2 do-install: - @(cd ${WRKSRC}/bin/.libs && \ + @(cd ${WRKSRC}/_build && \ ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin) .include diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo index d2b1796799fb..1f573d4c8c9c 100644 --- a/print/ft2demos/distinfo +++ b/print/ft2demos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603568666 -SHA256 (ft2demos-2.10.4.tar.xz) = 3f873ebe4fb387da3859149459f9be95320ce1fd56b50f8fdb9d2a8492887083 -SIZE (ft2demos-2.10.4.tar.xz) = 236712 +TIMESTAMP = 1641293484 +SHA256 (freetype-freetype-demos-07027905d9a47664251b3ee362c5cfad1cddf86f_GL0.tar.gz) = 61c872dde5aa69fc0a27019950c301cd3db7f11a776e4eb9859311d2fc0d3d5e +SIZE (freetype-freetype-demos-07027905d9a47664251b3ee362c5cfad1cddf86f_GL0.tar.gz) = 342190 diff --git a/print/ft2demos/files/patch-Makefile b/print/ft2demos/files/patch-Makefile deleted file mode 100644 index d4fdf71abe9c..000000000000 --- a/print/ft2demos/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.orig 2017-03-29 16:20:30 UTC -+++ Makefile -@@ -136,11 +136,9 @@ else - # Enable C99 for gcc to avoid warnings. - # Note that clang++ aborts with an error if we use `-std=C99', - # so check for `++' in $(CC) also. -- ifneq ($(findstring -pedantic,$(COMPILE)),) - ifeq ($(findstring ++,$(CC)),) - COMPILE += -std=c99 - endif -- endif - - FTLIB := $(LIB_DIR)/$(LIBRARY).$A - diff --git a/print/ft2demos/files/patch-meson.build b/print/ft2demos/files/patch-meson.build new file mode 100644 index 000000000000..69d0d5831227 --- /dev/null +++ b/print/ft2demos/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2021-12-02 03:37:39.000000000 -0900 ++++ meson.build 2022-01-04 02:25:43.961204000 -0900 +@@ -112,7 +112,7 @@ + + executable('ftgrid', + 'src/ftgrid.c', +- dependencies: libfreetype2_dep, ++ dependencies: [libfreetype2_dep, math_dep], + include_directories: graph_include_dir, + link_with: [ftcommon_lib, output_lib], + install: true)