linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Solomon Tan <wjsota@gmail.com>
To: y.karadz@gmail.com
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 2/2] kernel-shark: Allow FreeSans otf in addition to ttf
Date: Wed, 20 Apr 2022 23:38:27 +0800	[thread overview]
Message-ID: <20220420153827.637413-2-wjsota@gmail.com> (raw)
In-Reply-To: <20220420153827.637413-1-wjsota@gmail.com>

FreeSans comes as otf rather than ttf in some cases. An example
is the gnu-free-fonts on Arch. With this patch, both FreeSans.otf and
FreeSans.ttf will be accepted to make kernelshark.

Signed-off-by: Solomon Tan <wjsota@gmail.com>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5473bfa..3a48b0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ find_package(GLUT)
 
 set(KS_FONT FreeSans)
 if (NOT TT_FONT_FILE)
-    execute_process(COMMAND  bash "-c" "fc-list '${KS_FONT}' |grep ${KS_FONT}.ttf | cut -d':' -f 1 -z"
+    execute_process(COMMAND  bash "-c" "fc-list '${KS_FONT}' |grep -E ${KS_FONT}'(\.otf|\.ttf)' | cut -d':' -f 1 -z"
                     OUTPUT_VARIABLE TT_FONT_FILE)
 endif (NOT TT_FONT_FILE)
 
-- 
2.36.0


  reply	other threads:[~2022-04-20 15:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-09 10:48 Kernelshark v2 all-black plots area Dario Faggioli
2021-02-09 13:06 ` Yordan Karadzhov (VMware)
2021-02-09 16:13   ` Dario Faggioli
2021-02-10 11:21     ` Yordan Karadzhov (VMware)
2021-02-10 14:51       ` Dario Faggioli
2021-02-10 15:47         ` Yordan Karadzhov (VMware)
2021-02-10 16:15           ` Dario Faggioli
2021-02-10 16:23           ` Steven Rostedt
2022-04-20  0:38   ` Solomon Tan
2022-04-20  8:06     ` Yordan Karadzhov
2022-04-20 15:17       ` Solomon Tan
2022-04-20 15:38         ` [PATCH 1/2] kernel-shark: Make FreeSans a compulsory component Solomon Tan
2022-04-20 15:38           ` Solomon Tan [this message]
2022-04-21 12:16             ` [PATCH 2/2] kernel-shark: Allow FreeSans otf in addition to ttf Yordan Karadzhov
2022-04-21 12:04           ` [PATCH 1/2] kernel-shark: Make FreeSans a compulsory component Yordan Karadzhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220420153827.637413-2-wjsota@gmail.com \
    --to=wjsota@gmail.com \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=y.karadz@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).