From c39dc111d1140fd92af7930d3b26499a7631c2a4 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sat, 11 May 2024 22:47:01 +0200 Subject: [PATCH 1/2] small cleanup to prepare_delivery.sh --- scripts/prepare_delivery.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/prepare_delivery.sh b/scripts/prepare_delivery.sh index 135d13f97e..ab160ca924 100755 --- a/scripts/prepare_delivery.sh +++ b/scripts/prepare_delivery.sh @@ -65,7 +65,7 @@ while getopts "$ALL_OPTS" OPTION; do ;; esac;; h) - echo "usage: $0 [--strip_sr] [--no_zip]" >&2 + echo "usage: $0 [--no_zip]" >&2 exit -1 ;; *) @@ -124,14 +124,10 @@ recode lat1..ibmpc ${OUTDIR}/readme_split_rendering.txt # unix2dos ... cp ${ROOT}/LICENSE.md ${OUTDIR} recode lat1..ibmpc ${OUTDIR}/LICENSE.md # unix2dos ... -# include .clang_format, since this is a VS dependency -cp ${ROOT}/.clang-format ${OUTDIR} - # enable split rendering againg by default # in case we strip it later, it will be explicitly disabled again below sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h - ########################## # # # Stripping # -- GitLab From 1af29c92f9e6de6710d616eea54f63d26790003b Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 14 May 2024 00:56:00 +0200 Subject: [PATCH 2/2] update patch script --- scripts/patch_code_headers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/patch_code_headers.sh b/scripts/patch_code_headers.sh index f1a2cfd9e3..4705e684cb 100755 --- a/scripts/patch_code_headers.sh +++ b/scripts/patch_code_headers.sh @@ -62,7 +62,7 @@ fi c_header_new=\ '/*==================================================================================== - 3GPP TS26.258 Aug 24, 2023. IVAS Codec Version IVAS-FL-1.0 + 3GPP TS26.258 May 14, 2024. IVAS Codec Version IVAS-FL-2.0 ====================================================================================*/' @@ -139,7 +139,7 @@ rm -f $tmpfile # Patch Printout # -sed -i.bak -e "s/IVAS\ Codec\ Baseline/IVAS\ Codec\ Version\ IVAS-FL-1\.0/g" $WORKDIR/lib_com/disclaimer.c +sed -i.bak -e "s/IVAS\ Codec\ Baseline/IVAS\ Codec\ Version\ IVAS-FL-2\.0/g" $WORKDIR/lib_com/disclaimer.c # -- GitLab