From patchwork Mon Apr 15 13:23:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 12746 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3090D448542 for ; Mon, 15 Apr 2019 08:34:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D63468A40E; Mon, 15 Apr 2019 08:34:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99A7A689F6B for ; Mon, 15 Apr 2019 08:34:20 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Apr 2019 22:34:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,352,1549958400"; d="scan'208";a="135853975" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.13.25]) by orsmga006.jf.intel.com with ESMTP; 14 Apr 2019 22:34:18 -0700 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2019 21:23:31 +0800 Message-Id: <1555334611-18069-1-git-send-email-yejun.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH V2 1/2] configure: sort decoder/encoder/filter/... names in alphabet order X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" take decoder names an example, with the default page length, shell command 'pr' needs two pages for all the decoder names. The names are firstly printed in the first page, then in the second page. So, as a whole, the names are sorted neither in column order nor in row order. It's a little confused. One method is to calculate the proper page length, so all the names are printed in one page by 'pr -l', and so strictly in alphabet order, column by column. Another method is to use command printf instead of pr, because buybox doesn't have pr. This patch refines print_in_columns to print the names with printf in alphabet order, very similar with 'pr -l', except the case when the last column is not fully filled with names. Signed-off-by: Guo, Yejun --- configure | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/configure b/configure index c2580b3..45a9126 100755 --- a/configure +++ b/configure @@ -3830,14 +3830,30 @@ die_unknown(){ } print_in_columns() { - cols=$(expr $ncols / 24) - cat | tr ' ' '\n' | sort | pr -r "-$cols" -w $ncols -t + width=24 + cols=$(expr $ncols / $width) + rows=$(expr $(expr $# + $cols - 1) / $cols) + eval format="%-${width}s" + for row in $(seq 1 $rows); do + index=$row + line="" + lfmt="" + for col in $(seq 1 $cols); do + if [ $index -le $# ]; then + eval item=\$${index} + line=$line" "$item + lfmt=$lfmt$format + fi + index=$(expr $index + $rows) + done + printf "$lfmt\n" $line + done } show_list() { suffix=_$1 shift - echo $* | sed s/$suffix//g | print_in_columns + print_in_columns $(echo $* | sed s/$suffix//g | tr ' ' '\n' | sort) exit 0 } @@ -7118,32 +7134,32 @@ test -n "$random_seed" && echo echo "External libraries:" -print_enabled '' $EXTERNAL_LIBRARY_LIST $EXTERNAL_AUTODETECT_LIBRARY_LIST | print_in_columns +print_in_columns $(print_enabled '' $EXTERNAL_LIBRARY_LIST $EXTERNAL_AUTODETECT_LIBRARY_LIST | tr ' ' '\n' | sort) echo echo "External libraries providing hardware acceleration:" -print_enabled '' $HWACCEL_LIBRARY_LIST $HWACCEL_AUTODETECT_LIBRARY_LIST | print_in_columns +print_in_columns $(print_enabled '' $HWACCEL_LIBRARY_LIST $HWACCEL_AUTODETECT_LIBRARY_LIST | tr ' ' '\n' | sort) echo echo "Libraries:" -print_enabled '' $LIBRARY_LIST | print_in_columns +print_in_columns $(print_enabled '' $LIBRARY_LIST | tr ' ' '\n' | sort) echo echo "Programs:" -print_enabled '' $PROGRAM_LIST | print_in_columns +print_in_columns $(print_enabled '' $PROGRAM_LIST | tr ' ' '\n' | sort) echo for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do echo "Enabled ${type}s:" eval list=\$$(toupper $type)_LIST - print_enabled '_*' $list | print_in_columns + print_in_columns $(print_enabled '_*' $list | tr ' ' '\n' | sort) echo done if test -n "$ignore_tests"; then ignore_tests=$(echo $ignore_tests | tr ',' ' ') echo "Ignored FATE tests:" - echo $ignore_tests | print_in_columns + print_in_columns $(echo $ignore_tests | tr ' ' '\n' | sort) echo fi