From nobody Wed Apr 5 17:34:52 2023 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 4PsBbK2179z43pkn; Wed, 5 Apr 2023 17:34:53 +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 4PsBbJ47N3z4Ftx; Wed, 5 Apr 2023 17:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716092; 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=tjDDrQxMldnlpI9Kkez06U0DqA7c05xPEPDAOZ3bQv4=; b=diChCsgWIZ3QmdHOqSfnyGd0SndXaBBowvYlHrSc3pSjUtpVPzw2zPu0CtJS95WP05ZNcz mFwonaPrXHdb5IXavyYI1jsUti8fdt1GUce8RcQWViWUjJbsjoRLK4qbshPUdkeXpIMHiE aT7eVGfk6WPFthonDNL4fhmhk6nyySsk/0kcMvd4sMoc1c6RsdSQxJ0esXEKZ+OOh3M6oz 9PsUlxYxZi8OfeSHTlogWb/Sh4MXKm1Kk79LvtZ+wdCkRFJ6fmhTOZlxjEZ4xO2Pn6Sg3A OWvin+9JMXDfl8+2dxRxcf3PWV+niAbJ4B0id9QJ8pNmxwB7TI1D/nuFGuRcWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716092; 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=tjDDrQxMldnlpI9Kkez06U0DqA7c05xPEPDAOZ3bQv4=; b=QZSp8/NSFe12HmUfmXIkfE3heJwY4ihH80WPx6ZLz0slOYHcRAnV2cO784+reabL8obklt z5gq2PS9GfDKYD0paBJK6INi9/gSRS8feB/X8rOVSJeujVV43UDB7rGAHyPnDl3eeG1xtD 9Dnqw6D1TT6QnsKL7TjT+0yMw6i9NXus+ySUA1Y08AuXQjDNqIUQl3bp8JSEFrxwz2z1uC 6zLeczEABAkRXBrtHNvtNGvb1vF7qJyKa2KS0rD3z/Yiqn7H1tzEWy5H1Tb2ao5T8QWJ1Y lvuLoorGr+mPe6K4DxZrBfpBB6jmoBUi4K+eJxk/5A2IOzHgKoT5XOsXz0u4BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680716092; a=rsa-sha256; cv=none; b=wlXCAALrE7Enj7myQzqDyDJa70HrICGhBByUKDDku374v/N++0Txs9wHwrjFgZvGBlTa++ puS+/xNJgDFU7ztzxQkpNv7UmTwyCMM+0Jja6TedjCih0ABTgt6N+NkyKjLf0Ruc1T2ttk loGYfYpYfU9T5rHXjKk/SJDKfiCK8+p5gk38S4oj357XMtqmPUxLybEXS0NKmfLh6jGemZ vgiLclWvJbtq995CFQi+UTmJ18o8ol1xUPD0jGhh9riwIfNVE2QMNnMNso1EAFVJ3YVYBb xJoF5xo8rBnmnGlBDQ5DEjYtL46bZCd6owwPp5yzFl4JY/nOmk/e+HFGQuxLgw== 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 4PsBbJ1HH0zWxQ; Wed, 5 Apr 2023 17:34:52 +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 335HYqRj085021; Wed, 5 Apr 2023 17:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335HYq47085020; Wed, 5 Apr 2023 17:34:52 GMT (envelope-from git) Date: Wed, 5 Apr 2023 17:34:52 GMT Message-Id: <202304051734.335HYq47085020@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fe54a4105592 - main - x11-fonts/ots: Fix meson usage 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe54a410559205505a0ba18e5b18619dcf0f4e1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe54a410559205505a0ba18e5b18619dcf0f4e1e commit fe54a410559205505a0ba18e5b18619dcf0f4e1e Author: Po-Chuan Hsieh AuthorDate: 2023-04-05 17:14:41 +0000 Commit: Po-Chuan Hsieh 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',