From nobody Tue Apr 23 03:34:56 2024 X-Original-To: dev-commits-ports-main@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 4VNnmw5JTCz5JK1s; Tue, 23 Apr 2024 03:34:56 +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 4VNnmw4sLXz4RwM; Tue, 23 Apr 2024 03:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713843296; 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=Q6X/xa256VQojAJn0cMHGNGuQO0Lf1ML/PAO+grvCZE=; b=Q1pC0sJneDwVGMZkuWsOC4cPE78AvV7EmYpBTCZGVYtKFzUQtDAzFdrZMjWQ8LxHxaMv6p QnK07eK5iBWkrKSgUe/TZ0m8qlD8pRyf1lkzsEkG/oQI8ywHAYljUToqfyVLVP2pnTjkrQ CBi7YUx4oSZjGdDRHWoQJu6a94o7g4ByCu6TII3mtnosAuTYtDfHYJlZpiFoh40R/rEdmj K/xTDhobXqAbILqO/xZsPTtAbPVCYL1co3/0tamh+Po0mT2bLNCNi5YavQeLtXqpFheeE+ jpjFYxZ8RRBmZzygi0anvPMKtXD/06Yefe3BAS6NeiMAJuaZqIZTSNGcenrhdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713843296; a=rsa-sha256; cv=none; b=ROhGNezW/Ns12bc216Jiw/AqQbucsR+ovem0oUiGNVUzaHjp7ikdVugx5i9hB05+xd01pZ 5KJYacOwJRbXj06robRl5aR71MG9N8GhMfhpOOrSc4XI/0nF4bkdy5naWW+FoKtBTBQhtZ FPMNo+9jdIc0F9spFDqC0VHpy5biPC0LefCjW4fO6QhOsjnwIuchduMHOl/UxDrv0lc9hN jvYqRShSavBfCfGRtgzg0vjPw5oYK/isG1B+ES8c71PoTXWpAOEAhqYvGxs/KyqcbAIeFP liWvvOKJz3IGOqwgEJu0Sag/KIY2PZyG08ivYbwKBKJECLmLzlx/JNJ1aXzN3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713843296; 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=Q6X/xa256VQojAJn0cMHGNGuQO0Lf1ML/PAO+grvCZE=; b=P+poK04fey6486E44LMEVyvJ6scmvUiqUp8IlkZWrGObE/SqsloHJkO0Nn2BqeyLwdGwig OqKQun2AwcKC8JJiVRlJ3/tgFR7ejGd+fo8pSvmOPpfX275CZtKfLF5r9OHNJMWssvh9Dy w/mFVg3FUzEET58LhtocyaOZm0W1d97i2GKoQnolpR0yVG2na1skE10U5anEU2QwM8k9A7 s6MUlx0QLeX4pj4MoPlWQIP/WPdQUhwY8/HsGb95MRKB03aKfF/sYxn5DbiW7H+G6XlanT EDJ9/XkAE+UuyCFfcg6vkc+l6sRRYu3Y63ONNFrTruiLvufgCEo/0MuQNfxiAA== 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 4VNnmw4BDwzG7k; Tue, 23 Apr 2024 03:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N3YuOZ028322; Tue, 23 Apr 2024 03:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N3Yu5O028319; Tue, 23 Apr 2024 03:34:56 GMT (envelope-from git) Date: Tue, 23 Apr 2024 03:34:56 GMT Message-Id: <202404230334.43N3Yu5O028319@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 43bf4dd3397f - main - graphics/freetype-gl: update g20210208 =?utf-8?Q?=E2=86=92?= g20240122 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43bf4dd3397f7794092f18105f0d9932d7e37200 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=43bf4dd3397f7794092f18105f0d9932d7e37200 commit 43bf4dd3397f7794092f18105f0d9932d7e37200 Author: Yuri Victorovich AuthorDate: 2024-04-23 03:20:57 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-23 03:34:49 +0000 graphics/freetype-gl: update g20210208 → g20240122 --- graphics/freetype-gl/Makefile | 17 ++++++----------- graphics/freetype-gl/distinfo | 10 +++------- graphics/freetype-gl/files/patch-CMakeLists.txt | 14 ++++++++++++++ graphics/freetype-gl/pkg-plist | 24 ++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/graphics/freetype-gl/Makefile b/graphics/freetype-gl/Makefile index 81b258d5d262..bd293d04a982 100644 --- a/graphics/freetype-gl/Makefile +++ b/graphics/freetype-gl/Makefile @@ -1,12 +1,7 @@ PORTNAME= freetype-gl -DISTVERSION= g20210208 -PORTREVISION= 4 +DISTVERSION= g20240122 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= a38359cdcd97bfcf5d02dd65c66f516eac8208ad.patch:-p1 # https://github.com/rougier/freetype-gl/pull/233: Remove the STATIC requirement from the library -PATCHFILES+= 00a13d4c9e31f9c4e68e8ab30e2f7ec5b0e4bf60.patch:-p1 # https://github.com/rougier/freetype-gl/pull/235: Fix Fontconfig dependency name in demos - MAINTAINER= yuri@FreeBSD.org COMMENT= C OpenGL Freetype engine library WWW= https://github.com/rougier/freetype-gl @@ -17,15 +12,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 USES= cmake:noninja gl magick:test,nox11 -USE_GL= glew +USE_GL= gl glew glu USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= rougier -GH_TAGNAME= 647b062 +GH_TAGNAME= 9543576 -CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= freetype-gl_BUILD_APIDOC freetype-gl_BUILD_TESTS +CMAKE_ON= freetype-gl_BUILD_SHARED +CMAKE_OFF= freetype-gl_BUILD_APIDOC freetype-gl_BUILD_TESTS \ + FIND_LIBRARY_USE_LIB64_PATHS LDFLAGS+= -L${LOCALBASE}/lib -lGLEW -lfreetype # https://github.com/rougier/freetype-gl/issues/236 @@ -33,7 +29,6 @@ OPTIONS_DEFINE= DEMOS OPTIONS_SUB= yes DEMOS_DESC= Build and install demo programs -DEMOS_USE= GL=gl,glu DEMOS_CMAKE_BOOL= freetype-gl_BUILD_DEMOS DEMOS_LIB_DEPENDS= libAntTweakBar.so:graphics/anttweakbar \ libfontconfig.so:x11-fonts/fontconfig \ diff --git a/graphics/freetype-gl/distinfo b/graphics/freetype-gl/distinfo index 29ab8c736993..277c46d6d2c9 100644 --- a/graphics/freetype-gl/distinfo +++ b/graphics/freetype-gl/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1616019755 -SHA256 (rougier-freetype-gl-g20210208-647b062_GH0.tar.gz) = 25623958a56e686626e318e8772d133203e1111a73ec0b4efb8785162541d701 -SIZE (rougier-freetype-gl-g20210208-647b062_GH0.tar.gz) = 11947093 -SHA256 (a38359cdcd97bfcf5d02dd65c66f516eac8208ad.patch) = 36f29ad78708579a26e7bddf0d24746a99c70ea11aa4be53f3636934c8e133c9 -SIZE (a38359cdcd97bfcf5d02dd65c66f516eac8208ad.patch) = 1064 -SHA256 (00a13d4c9e31f9c4e68e8ab30e2f7ec5b0e4bf60.patch) = fec0ebf2439dea2dff47421c06fe79d3c88a6c777091a5a5b729f227a939712a -SIZE (00a13d4c9e31f9c4e68e8ab30e2f7ec5b0e4bf60.patch) = 967 +TIMESTAMP = 1713841334 +SHA256 (rougier-freetype-gl-g20240122-9543576_GH0.tar.gz) = 2b26cfe8d62a3bf19614704fb498804e7b491142224936bb5317d1129836fe6b +SIZE (rougier-freetype-gl-g20240122-9543576_GH0.tar.gz) = 12214353 diff --git a/graphics/freetype-gl/files/patch-CMakeLists.txt b/graphics/freetype-gl/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f83d2076e7df --- /dev/null +++ b/graphics/freetype-gl/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +- workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278539 + +--- CMakeLists.txt.orig 2024-04-23 03:14:59 UTC ++++ CMakeLists.txt +@@ -241,7 +241,8 @@ endif(freetype-gl_BUILD_TESTS) + add_subdirectory(tests) + endif(freetype-gl_BUILD_TESTS) + +-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) ++#get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) ++set(LIB64 FALSE) + + if ("${LIB64}" STREQUAL "TRUE") + set(LIBSUFFIX 64) diff --git a/graphics/freetype-gl/pkg-plist b/graphics/freetype-gl/pkg-plist index 965ed8a874d9..99a2092c99da 100644 --- a/graphics/freetype-gl/pkg-plist +++ b/graphics/freetype-gl/pkg-plist @@ -16,10 +16,19 @@ %%DEMOS%%bin/ftgl-demo-outline %%DEMOS%%bin/ftgl-demo-subpixel %%DEMOS%%bin/ftgl-demo-texture +include/config.h +include/distance-field.h +include/edtaa3func.h +include/font-manager.h +include/freetype-gl-errdef.h +include/freetype-gl.h +include/freetype-gl/config.h include/freetype-gl/distance-field.h include/freetype-gl/edtaa3func.h include/freetype-gl/font-manager.h +include/freetype-gl/freetype-gl-errdef.h include/freetype-gl/freetype-gl.h +include/freetype-gl/ftgl-utils.h include/freetype-gl/markup.h include/freetype-gl/opengl.h include/freetype-gl/platform.h @@ -31,7 +40,21 @@ include/freetype-gl/vec234.h include/freetype-gl/vector.h include/freetype-gl/vertex-attribute.h include/freetype-gl/vertex-buffer.h +include/ftgl-utils.h +include/markup.h +include/opengl.h +include/platform.h +include/text-buffer.h +include/texture-atlas.h +include/texture-font.h +include/utf8-utils.h +include/vec234.h +include/vector.h +include/vertex-attribute.h +include/vertex-buffer.h lib/libfreetype-gl.so +lib/libfreetype-gl.so.0 +lib/libfreetype-gl.so.0.3.2 %%DEMOS%%%%DATADIR%%/data/256colors.txt %%DEMOS%%%%DATADIR%%/fonts/Liberastika-Regular-LICENSE.txt %%DEMOS%%%%DATADIR%%/fonts/Liberastika-Regular.ttf @@ -66,3 +89,4 @@ lib/libfreetype-gl.so %%DEMOS%%%%DATADIR%%/shaders/v3f-c4f.vert %%DEMOS%%%%DATADIR%%/shaders/v3f-t2f-c4f.frag %%DEMOS%%%%DATADIR%%/shaders/v3f-t2f-c4f.vert +share/pkgconfig/freetype-gl.pc