From owner-svn-ports-all@freebsd.org Sun Nov 15 18:00:23 2020 Return-Path: Delivered-To: svn-ports-all@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 EF12B2EFF6A; Sun, 15 Nov 2020 18:00:23 +0000 (UTC) (envelope-from sunpoet@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZ0Nl3bMyz4jF7; Sun, 15 Nov 2020 18:00:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7AA61FEA4; Sun, 15 Nov 2020 18:00:20 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AFI0K1Z007397; Sun, 15 Nov 2020 18:00:20 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AFI0K4K007394; Sun, 15 Nov 2020 18:00:20 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011151800.0AFI0K4K007394@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 15 Nov 2020 18:00:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555279 - in head/x11-fonts/ots: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/x11-fonts/ots: . files X-SVN-Commit-Revision: 555279 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 18:00:24 -0000 Author: sunpoet Date: Sun Nov 15 18:00:19 2020 New Revision: 555279 URL: https://svnweb.freebsd.org/changeset/ports/555279 Log: Update to 8.1.0 Changes: https://github.com/khaledhosny/ots/releases Modified: head/x11-fonts/ots/Makefile head/x11-fonts/ots/distinfo head/x11-fonts/ots/files/patch-meson.build head/x11-fonts/ots/pkg-plist Modified: head/x11-fonts/ots/Makefile ============================================================================== --- head/x11-fonts/ots/Makefile Sun Nov 15 18:00:15 2020 (r555278) +++ head/x11-fonts/ots/Makefile Sun Nov 15 18:00:19 2020 (r555279) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ots -PORTVERSION= 8.0.0 +PORTVERSION= 8.1.0 CATEGORIES= x11-fonts MASTER_SITES= https://github.com/khaledhosny/ots/releases/download/v${PORTVERSION}/ @@ -22,6 +22,8 @@ USES= compiler:c++11-lang meson pkgconfig shebangfix MESON_FALSE= debug MESON_TRUE= graphite + +PLIST_SUB= PORTVERSION=${PORTVERSION} SHEBANG_FILES= tests/*.sh bash_CMD= ${SH} Modified: head/x11-fonts/ots/distinfo ============================================================================== --- head/x11-fonts/ots/distinfo Sun Nov 15 18:00:15 2020 (r555278) +++ head/x11-fonts/ots/distinfo Sun Nov 15 18:00:19 2020 (r555279) @@ -1,3 +1,3 @@ -TIMESTAMP = 1598647109 -SHA256 (ots-8.0.0.tar.xz) = 00aed968f88d492bc42e9ddb941bda9502267d54c51021ad071b51effaa0401a -SIZE (ots-8.0.0.tar.xz) = 58701500 +TIMESTAMP = 1605426371 +SHA256 (ots-8.1.0.tar.xz) = e87cb5c18962e3b94b7ee27ab66fee9fdb22b12a9e06de9ecc3ef4f6990cefba +SIZE (ots-8.1.0.tar.xz) = 58775496 Modified: head/x11-fonts/ots/files/patch-meson.build ============================================================================== --- head/x11-fonts/ots/files/patch-meson.build Sun Nov 15 18:00:15 2020 (r555278) +++ head/x11-fonts/ots/files/patch-meson.build Sun Nov 15 18:00:19 2020 (r555279) @@ -1,17 +1,17 @@ ---- meson.build.orig 2019-08-30 08:38:31 UTC +--- meson.build.orig 2020-10-12 15:09:18 UTC +++ meson.build @@ -1,6 +1,6 @@ project('ots', 'c', 'cpp', - version: '8.0.0', + version: '8.1.0', - default_options : ['cpp_std=c++11', 'default_library=static'], + default_options : ['cpp_std=c++11', 'default_library=both'], ) cxx = meson.get_compiler('cpp') -@@ -38,52 +38,52 @@ configure_file(output: 'config.h', - configuration: conf) +@@ -44,28 +44,28 @@ if 'undefined' in get_option('b_sanitize').split(',') + brotli_c_args += '-DBROTLI_BUILD_PORTABLE' + endif - -brotli_includes = ['third_party/brotli/c/include'] -libbrotli = library('brotli', - 'third_party/brotli/c/common/constants.h', @@ -32,6 +32,7 @@ - 'third_party/brotli/c/include/brotli/port.h', - 'third_party/brotli/c/include/brotli/types.h', - include_directories: include_directories(brotli_includes), +- c_args: brotli_c_args, -) +#brotli_includes = ['third_party/brotli/c/include'] +#libbrotli = library('brotli', @@ -53,9 +54,15 @@ +# 'third_party/brotli/c/include/brotli/port.h', +# 'third_party/brotli/c/include/brotli/types.h', +# include_directories: include_directories(brotli_includes), ++# c_args: brotli_c_args, +#) + woff2_cpp_args = [] +@@ -75,30 +75,30 @@ if 'undefined' in get_option('b_sanitize').split(',') + woff2_cpp_args += '-U__BYTE_ORDER__' + endif + -woff2_includes = ['third_party/brotli/c/include', 'third_party/woff2/include'] -libwoff2 = library('woff2', - 'third_party/woff2/include/woff2/decode.h', @@ -73,6 +80,7 @@ - 'third_party/woff2/src/woff2_dec.cc', - 'third_party/woff2/src/woff2_out.cc', - include_directories: include_directories(woff2_includes), +- cpp_args: woff2_cpp_args, -) +#woff2_includes = ['third_party/brotli/c/include', 'third_party/woff2/include'] +#libwoff2 = library('woff2', @@ -91,6 +99,7 @@ +# 'third_party/woff2/src/woff2_dec.cc', +# 'third_party/woff2/src/woff2_out.cc', +# include_directories: include_directories(woff2_includes), ++# cpp_args: woff2_cpp_args, +#) @@ -101,7 +110,7 @@ ] ots_sources = [ -@@ -167,10 +167,10 @@ ots_sources = [ +@@ -180,10 +180,10 @@ ots_sources = [ 'src/vvar.h', ] @@ -114,7 +123,7 @@ ots_sources += [ 'src/feat.cc', 'src/feat.h', -@@ -186,21 +186,27 @@ if get_option('graphite') +@@ -199,21 +199,28 @@ if get_option('graphite') 'src/sill.h', 'src/sill.cc', ] @@ -141,6 +150,7 @@ ots_sources, include_directories: include_directories(ots_includes), - link_with: ots_libs, ++# link_with: ots_libs, cpp_args : '-DHAVE_CONFIG_H', - dependencies: zlib, + dependencies: [libbrotlicommon, libbrotlidec, libwoff2common, libwoff2dec, liblz4, zlib], @@ -149,7 +159,7 @@ ) -@@ -226,6 +232,7 @@ executable('ots-fuzzer', +@@ -239,6 +246,7 @@ executable('ots-fuzzer', cpp_args: fuzzer_defines, link_with: libots, link_args: fuzzer_ldflags, @@ -157,10 +167,12 @@ ) -@@ -291,12 +298,13 @@ endif +@@ -303,13 +311,14 @@ if cxx.has_header('sys/time.h') + endif - gtest = dependency('gtest', fallback: ['gtest', 'gtest_main_dep']) +-gtest = subproject('gtest').get_variable('gtest_main_dep') ++gtest = dependency('gtest', fallback: ['gtest', 'gtest_main_dep']) +gtest_main = dependency('gtest_main') cff_charstring = executable('cff_charstring', @@ -172,7 +184,7 @@ ) test('cff_charstring', cff_charstring) -@@ -306,7 +314,7 @@ layout_common_table = executable('layout_common_table' +@@ -319,7 +328,7 @@ layout_common_table = executable('layout_common_table' 'tests/layout_common_table_test.cc', include_directories: include_directories(['include', 'src']), link_with: libots, Modified: head/x11-fonts/ots/pkg-plist ============================================================================== --- head/x11-fonts/ots/pkg-plist Sun Nov 15 18:00:15 2020 (r555278) +++ head/x11-fonts/ots/pkg-plist Sun Nov 15 18:00:19 2020 (r555279) @@ -7,4 +7,4 @@ bin/ots-validator-checker lib/libots.a lib/libots.so lib/libots.so.8 -lib/libots.so.8.0.0 +lib/libots.so.%%PORTVERSION%%