Commit 4ab2cd8c authored by multrus's avatar multrus
Browse files

Merge branch 'update_patch_script' into 'main' 

Update patch script for 3GPP releases

See merge request !1565
parents 86862b41 1af29c92

scripts/patch_code_headers.sh

+2 −2
Original line number Diff line number Diff line
@@ -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





#

scripts/prepare_delivery.sh

+1 −5
Original line number Diff line number Diff line
@@ -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              #