gst-plugin-gva patch (#601)

* add CHECKPOINT_DISABLE=1 * add gst-gva patch * exclude 1604 Co-authored-by: jhou5 <[email protected]>
OpenVisualCloud · Nov 2, 2020 · 4a07dbe · 4a07dbe
1 parent b64270d
commit 4a07dbe
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 0 deletions.
diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile
@@ -600,6 +600,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile
@@ -554,6 +554,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile
@@ -612,6 +612,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile
@@ -564,6 +564,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile
@@ -718,6 +718,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile
@@ -663,6 +663,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile
@@ -746,6 +746,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile
@@ -702,6 +702,7 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+    sed -i "195s/) {/||g_strrstr(name, \"image\")) {/" gst/elements/gvapython/python_callback.cpp && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \

diff --git a/template/gst-plugin-gva.m4 b/template/gst-plugin-gva.m4
@@ -21,6 +21,8 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     cd gst-video-analytics && \
     git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
     git submodule init && git submodule update && \
+ifelse(index(DOCKER_IMAGE,ubuntu1604),-1,`    sed -i ```"195s/) {/||g_strrstr(name, \"image\")) {/"''' gst/elements/gvapython/python_callback.cpp && \
+')dnl
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \