Date: Wed, 5 Apr 2023 17:34:52 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fe54a4105592 - main - x11-fonts/ots: Fix meson usage Message-ID: <202304051734.335HYq47085020@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe54a410559205505a0ba18e5b18619dcf0f4e1e commit fe54a410559205505a0ba18e5b18619dcf0f4e1e Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-04-05 17:14:41 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-04-05 17:29:59 +0000 x11-fonts/ots: Fix meson usage - Convert patch file to MESON_ARGS - Convert nonexistent MESON_TRUE/MESON_FALSE to MESON_ARGS --- x11-fonts/ots/Makefile | 3 +-- x11-fonts/ots/files/patch-meson.build | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/x11-fonts/ots/Makefile b/x11-fonts/ots/Makefile index 01d6f376f24f..1ef563fba129 100644 --- a/x11-fonts/ots/Makefile +++ b/x11-fonts/ots/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ USES= compiler:c++11-lang meson pkgconfig tar:xz -MESON_FALSE= debug -MESON_TRUE= graphite +MESON_ARGS= --default-library=both -Ddebug=false -Dgraphite=true PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/x11-fonts/ots/files/patch-meson.build b/x11-fonts/ots/files/patch-meson.build index 65cdb7306c40..a546c2b29cc3 100644 --- a/x11-fonts/ots/files/patch-meson.build +++ b/x11-fonts/ots/files/patch-meson.build @@ -1,13 +1,5 @@ --- meson.build.orig 2021-03-07 06:36:19 UTC +++ meson.build -@@ -1,6 +1,6 @@ - project('ots', 'c', 'cpp', - version: '8.1.4', -- default_options : ['cpp_std=c++11', 'default_library=static', 'warning_level=2'], -+ default_options : ['cpp_std=c++11', 'default_library=both', 'warning_level=2'], - meson_version : '>= 0.55.2', - ) - @@ -150,6 +150,8 @@ libots = library('ots', include_directories: include_directories('include'), cpp_args : '-DHAVE_CONFIG_H',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304051734.335HYq47085020>