Update FFmpeg build guide and update DALI_deps version (#2911)

* Update FFmpeg build guide and update DALI_deps version Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
NVIDIA · May 7, 2021 · 8172932 · 8172932
1 parent b165b3c
commit 8172932
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION
@@ -1 +1 @@
-c7e228365f0cd8b3ef06304474333becd209197a
+dedb1034c283cbec1c1ae0035f21b4386ab23f18
diff --git 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 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
diff --git a/docs/compilation.rst b/docs/compilation.rst
@@ -256,6 +256,8 @@ 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
 
 .. note::