From 4a07dbe08b27c7f3c744ed4f9c9dbac2546b6b89 Mon Sep 17 00:00:00 2001 From: xwu2 <3871873+xwu2git@users.noreply.github.com> Date: Sun, 1 Nov 2020 19:17:29 -0800 Subject: [PATCH] gst-plugin-gva patch (#601) * add CHECKPOINT_DISABLE=1 * add gst-gva patch * exclude 1604 Co-authored-by: jhou5 <33681822+jhou5@users.noreply.github.com> --- Xeon/centos-7/analytics/dev/Dockerfile | 1 + Xeon/centos-7/analytics/gst/Dockerfile | 1 + Xeon/ubuntu-18.04/analytics/dev/Dockerfile | 1 + Xeon/ubuntu-18.04/analytics/gst/Dockerfile | 1 + XeonE3/centos-7/analytics/dev/Dockerfile | 1 + XeonE3/centos-7/analytics/gst/Dockerfile | 1 + XeonE3/ubuntu-18.04/analytics/dev/Dockerfile | 1 + XeonE3/ubuntu-18.04/analytics/gst/Dockerfile | 1 + template/gst-plugin-gva.m4 | 2 ++ 9 files changed, 10 insertions(+) diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index 0b157d0a0..8ecaeb7ea 100644 --- 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 index 7adc0c36e..43aec1a0d 100644 --- 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 index 6e0abc189..3918191ec 100644 --- 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 index 685af9aee..0f96143a6 100644 --- 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 index e097bf6f4..9ce5b6c83 100644 --- 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 index e5656288b..83d61ee81 100644 --- 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 index 7de176935..41e8ae83b 100644 --- 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 index 9da87a166..12e8e9241 100644 --- 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 index 6a07cffb3..963311951 100644 --- 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" && \