From 8c0eeadd9b84b9734bfe90a26c7622525bfcb8d1 Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Thu, 29 Apr 2021 14:37:00 +0200 Subject: [PATCH 1/4] Update FFmpeg build guide and update DALI_deps version Signed-off-by: Janusz Lisiecki --- DALI_DEPS_VERSION | 2 +- conda/third_party/dali_ffmpeg/recipe/build.sh | 2 ++ docs/compilation.rst | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION index b798aa72ac..edb0d5653d 100644 --- a/DALI_DEPS_VERSION +++ b/DALI_DEPS_VERSION @@ -1 +1 @@ -c7e228365f0cd8b3ef06304474333becd209197a +c5e52167456af3cd39d74007e3872a34b4b0f563 diff --git a/conda/third_party/dali_ffmpeg/recipe/build.sh b/conda/third_party/dali_ffmpeg/recipe/build.sh index 0f0040433e..2e1c4a65da 100644 --- a/conda/third_party/dali_ffmpeg/recipe/build.sh +++ b/conda/third_party/dali_ffmpeg/recipe/build.sh @@ -53,5 +53,7 @@ unset SUBDIR --disable-filters \ --disable-bsfs \ --enable-bsf=h264_mp4toannexb,hevc_mp4toannexb,mpeg4_unpack_bframes +# adds | sed 's/\(.*{\)/DALI_\1/' | to the version file generation command - it addpends "DALI_" to the symbol version +sed -i 's/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | sed '\''s\/\\(\.*{\\)\/DALI_\\1\/'\'' | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/' ffbuild/library.mak make -j"$(nproc --all)" make install diff --git a/docs/compilation.rst b/docs/compilation.rst index 2693ec655b..462192c768 100644 --- a/docs/compilation.rst +++ b/docs/compilation.rst @@ -256,6 +256,7 @@ For the recommended dependency versions please check https://github.com/NVIDIA/D --disable-filters \ --disable-bsfs \ --enable-bsf=h264_mp4toannexb,hevc_mp4toannexb,mpeg4_unpack_bframes && \ + sed -i 's/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | sed '\''s\/\\(\.*{\\)\/DALI_\\1\/'\'' | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/' ffbuild/library.mak \ make .. note:: From bd37bac96fa2743fef9cfe97118871f177d50b16 Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Fri, 30 Apr 2021 13:26:27 +0200 Subject: [PATCH 2/4] Review fixes Signed-off-by: Janusz Lisiecki --- DALI_DEPS_VERSION | 2 +- conda/third_party/dali_ffmpeg/recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION index edb0d5653d..ec2129b988 100644 --- a/DALI_DEPS_VERSION +++ b/DALI_DEPS_VERSION @@ -1 +1 @@ -c5e52167456af3cd39d74007e3872a34b4b0f563 +11cbe22856bd00f866c814232b749d81800b27bf diff --git a/conda/third_party/dali_ffmpeg/recipe/build.sh b/conda/third_party/dali_ffmpeg/recipe/build.sh index 2e1c4a65da..21e3e959b7 100644 --- a/conda/third_party/dali_ffmpeg/recipe/build.sh +++ b/conda/third_party/dali_ffmpeg/recipe/build.sh @@ -53,7 +53,7 @@ unset SUBDIR --disable-filters \ --disable-bsfs \ --enable-bsf=h264_mp4toannexb,hevc_mp4toannexb,mpeg4_unpack_bframes -# adds | sed 's/\(.*{\)/DALI_\1/' | to the version file generation command - it addpends "DALI_" to the symbol version +# adds | sed 's/\(.*{\)/DALI_\1/' | to the version file generation command - it prepends "DALI_" to the symbol version sed -i 's/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | sed '\''s\/\\(\.*{\\)\/DALI_\\1\/'\'' | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/' ffbuild/library.mak make -j"$(nproc --all)" make install From 4b60ab520fe1758b9d1f6d7865da85203c4a5e83 Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Wed, 5 May 2021 12:27:25 +0200 Subject: [PATCH 3/4] Review fixes Signed-off-by: Janusz Lisiecki --- docs/compilation.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/compilation.rst b/docs/compilation.rst index 462192c768..d8fd56a3dc 100644 --- a/docs/compilation.rst +++ b/docs/compilation.rst @@ -256,6 +256,7 @@ For the recommended dependency versions please check https://github.com/NVIDIA/D --disable-filters \ --disable-bsfs \ --enable-bsf=h264_mp4toannexb,hevc_mp4toannexb,mpeg4_unpack_bframes && \ + # adds "| sed 's/\(.*{\)/DALI_\1/' |" to the version file generation command - it prepends "DALI_" to the symbol version sed -i 's/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | sed '\''s\/\\(\.*{\\)\/DALI_\\1\/'\'' | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/' ffbuild/library.mak \ make From b4b9e8ed915cecf11810c6cb3bec31a21aaf62f7 Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Thu, 6 May 2021 14:21:53 +0200 Subject: [PATCH 4/4] Update DEPS sha Signed-off-by: Janusz Lisiecki --- DALI_DEPS_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION index ec2129b988..4edc580e0f 100644 --- a/DALI_DEPS_VERSION +++ b/DALI_DEPS_VERSION @@ -1 +1 @@ -11cbe22856bd00f866c814232b749d81800b27bf +dedb1034c283cbec1c1ae0035f21b4386ab23f18