fixing gvapython for Xeon images

OpenVisualCloud · Mar 10, 2021 · 9fcaf1b · 9fcaf1b
1 parent b4a3a78
commit 9fcaf1b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 24 deletions.
diff --git a/template/components/gst-core.m4 b/template/components/gst-core.m4
@@ -33,13 +33,13 @@ include(begin.m4)
 DECLARE(`GSTCORE_VER',1.16.2)
 
 ifelse(OS_NAME,ubuntu,`
-define(`GSTCORE_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison')
+define(`GSTCORE_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev')
 define(`GSTCORE_INSTALL_DEPS',`libglib2.0-0')
 ')
 
 ifelse(OS_NAME,centos,`
-define(`GSTCORE_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc-c++ glib2-devel bison flex')
-define(`GSTCORE_INSTALL_DEPS',`glib2')
+define(`GSTCORE_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel')
+define(`GSTCORE_INSTALL_DEPS',`glib2 gobject-introspection')
 ')
 
 define(`BUILD_GSTCORE',`
@@ -54,6 +54,7 @@ RUN cd BUILD_HOME/gstreamer-GSTCORE_VER && \
     -Dexamples=disabled \
     -Dtests=disabled \
     -Ddoc=disabled \
+    -Dintrospection=enabled \
     -Dgtk_doc=disabled && \
     cd build && \
     ninja install && \

diff --git a/template/components/gst-gva.m4 b/template/components/gst-gva.m4
@@ -45,13 +45,13 @@ DECLARE(`GVA_ENABLE_AUDIO_INFERENCE_ELEMENTS',OFF)
 include(gst-plugins-base.m4)
 
 ifelse(OS_NAME,ubuntu,`
-define(`GVA_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake) git ocl-icd-opencl-dev opencl-headers pkg-config libpython3-dev python-gi-dev ifdef(`BUILD_LIBVA2',,libva-dev)')
+define(`GVA_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake) git ocl-icd-opencl-dev opencl-headers pkg-config libpython3-dev python-gi-dev ca-certificates ifdef(`BUILD_LIBVA2',,libva-dev)')
 define(`GVA_INSTALL_DEPS',`ocl-icd-libopencl1 python3-gi python3-gi-cairo python3-dev libgl1-mesa-glx ifdef(`ENABLE_INTEL_GFX_REPO',libva2 ifelse(GVA_WITH_DRM,yes,libva-drm2))')
 ')
 
 ifelse(OS_NAME,centos,`
-define(`GVA_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) git ocl-icd-devel opencl-headers pkg-config')
-define(`GVA_INSTALL_DEPS',`ocl-icd libass')
+define(`GVA_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) git ocl-icd-devel opencl-headers pkg-config ca-certificates python36-gobject-devel python3-devel')
+define(`GVA_INSTALL_DEPS',`ocl-icd libass python3-devel boost-regex python36-gobject python36-gobject-devel python36-gobject-base')
 ')
 
 define(`BUILD_GVA',`
@@ -87,11 +87,11 @@ RUN git clone -b GVA_VER --depth 1 $GVA_REPO BUILD_HOME/gst-video-analytics && \
     && make -j $(nproc) \
     && make install \
     && make install DESTDIR=BUILD_DESTDIR
-ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/gstreamer-1.0/:/usr/local/lib/
+ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:BUILD_LIBDIR/gstreamer-1.0/:/usr/local/lib/
 
-RUN cp -r  BUILD_HOME/gst-video-analytics/build/intel64/Release/lib/* /usr/local/lib/gstreamer-1.0/.
-RUN cp -r  BUILD_HOME/gst-video-analytics/build/intel64/Release/lib/* BUILD_DESTDIR/usr/local/lib/gstreamer-1.0/.
-ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/
+RUN cp -r  BUILD_HOME/gst-video-analytics/build/intel64/Release/lib/* BUILD_LIBDIR/gstreamer-1.0/.
+RUN cp -r  BUILD_HOME/gst-video-analytics/build/intel64/Release/lib/* BUILD_DESTDIR/BUILD_LIBDIR/gstreamer-1.0/.
+ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:BUILD_LIBDIR/gstreamer-1.0/
 
 RUN mkdir -p /opt/intel/dl_streamer/python && \
     cp -r BUILD_HOME/gst-video-analytics/python/* /opt/intel/dl_streamer/python
@@ -102,10 +102,10 @@ RUN mkdir -p BUILD_DESTDIR/opt/intel/dl_streamer/python && \
 ')
 
 define(`INSTALL_GVA',
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
-ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/lib/x86_64-linux-gnu/girepository-1.0/
+ENV LD_LIBRARY_PATH=BUILD_LIBDIR/gstreamer-1.0/
+ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:BUILD_LIBDIR/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
-ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/
+ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:BUILD_LIBDIR/gstreamer-1.0/
 )
 
 REG(GVA)

diff --git a/template/components/gst-plugins-bad.m4 b/template/components/gst-plugins-bad.m4
@@ -49,15 +49,15 @@ DECLARE(`GST_RSVG',false)
 DECLARE(`GST_FDKAAC',ifdef(`BUILD_LIBFDKAAC',true,false))
 
 ifelse(OS_NAME,ubuntu,`
-define(`GSTBAD_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl4-gnutls-dev) ifelse(GST_RTMP,true,librtmp-dev) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,libx265-dev)) ifelse(GST_LIBDE265DEC,true,libde265-dev) ifelse(GST_RSVG,true,librsvg2-dev) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac-dev))')
+define(`GSTBAD_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl4-gnutls-dev) ifelse(GST_RTMP,true,librtmp-dev) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,libx265-dev)) ifelse(GST_LIBDE265DEC,true,libde265-dev) ifelse(GST_RSVG,true,librsvg2-dev) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac-dev))')
 
 define(`GSTBAD_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl3-gnutls) ifelse(GST_RTMP,true,librtmp1) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,libx265-ifelse(OS_VERSION,18.04,142,179))) ifelse(GST_LIBDE265DEC,true,libde265-0) ifelse(GST_RSVG,true,librsvg2-2) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac1))')
 ')
 
 ifelse(OS_NAME,centos,`
-define(`GSTBAD_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar glib2-devel bison flex ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl-devel) ifelse(GST_RTMP,true,librtmp-devel) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265-devel)) ifelse(GST_LIBDE265DEC,true,libde265-devel) ifelse(OS_VERSION,7,devtoolset-9) ifelse(GST_RSVG,true,librsvg2-devel)')
+define(`GSTBAD_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar glib2-devel bison flex gobject-introspection-devel ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl-devel) ifelse(GST_RTMP,true,librtmp-devel) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265-devel)) ifelse(GST_LIBDE265DEC,true,libde265-devel) ifelse(OS_VERSION,7,devtoolset-9) ifelse(GST_RSVG,true,librsvg2-devel)')
 
-define(`GSTBAD_INSTALL_DEPS',`glib2 ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl)) ifelse(GST_RTMP,true,librtmp) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265)) ifelse(GST_LIBDE265DEC,true,libde265) ifelse(GST_RSVG,true,librsvg2)')
+define(`GSTBAD_INSTALL_DEPS',`glib2 gobject-introspection ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl)) ifelse(GST_RTMP,true,librtmp) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265)) ifelse(GST_LIBDE265DEC,true,libde265) ifelse(GST_RSVG,true,librsvg2)')
 ')
 
 define(`BUILD_GSTBAD',`
@@ -75,6 +75,7 @@ RUN cd BUILD_HOME && \
       -Dexamples=disabled \
       -Dgtk_doc=disabled \
       -Dtests=disabled \
+      -Dintrospection=enabled \
       -Dgst_player_tests=false \
       -Drtmp=ifelse(GST_RTMP,true,enabled,disabled) \
       -Dx265=ifelse(GST_X265ENC,true,enabled,disabled) \

diff --git a/template/components/gst-plugins-base.m4 b/template/components/gst-plugins-base.m4
@@ -44,15 +44,15 @@ DECLARE(`GST_LIBVISUAL',true)
 DECLARE(`GST_OPENGL',true)
 
 ifelse(OS_NAME,ubuntu,`
-define(`GSTBASE_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ gobjc wget pkg-config libglib2.0-dev flex bison ifelse(GST_XLIB,true,libx11-dev libxv-dev libxt-dev) ifelse(GST_ALSA,true,libasound2-dev) ifelse(GST_PANGO,true,libpango1.0-dev) ifelse(GST_THEORA,true,libtheora-dev) ifelse(GST_LIBVISUAL,true,libvisual-0.4-dev) ifelse(GST_OPENGL,true,libgl1-mesa-dev libx11-xcb-dev)')
+define(`GSTBASE_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev ifelse(GST_XLIB,true,libx11-dev libxv-dev libxt-dev) ifelse(GST_ALSA,true,libasound2-dev) ifelse(GST_PANGO,true,libpango1.0-dev) ifelse(GST_THEORA,true,libtheora-dev) ifelse(GST_LIBVISUAL,true,libvisual-0.4-dev) ifelse(GST_OPENGL,true,libgl1-mesa-dev libx11-xcb-dev)')
 
-define(`GSTBASE_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_XLIB,true,libx11-6 libxv1 libxt6) ifelse(GST_ALSA,true,libasound2) ifelse(GST_PANGO,true,libpangocairo-1.0-0 libcairo-gobject2) ifelse(GST_THEORA,true,libtheora0) ifelse(GST_LIBVISUAL,true,libvisual-0.4-0) ifelse(GST_OPENGL,true,libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa)')
+define(`GSTBASE_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_XLIB,true,libx11-6 libxv1 libxt6) ifelse(GST_ALSA,true,libasound2) ifelse(GST_PANGO,true,libpangocairo-1.0-0 libcairo-gobject2) ifelse(GST_THEORA,true,libtheora0) ifelse(GST_LIBVISUAL,true,libvisual-0.4-0) ifelse(GST_OPENGL,true,libgl1-mesa-dri libgl1-mesa-glx libegl1)')
 ')
 
 ifelse(OS_NAME,centos,`
-define(`GSTBASE_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc gcc-objc gcc-c++ glib2-devel bison flex ifelse(GST_XLIB,true,libX11-devel libXv-devel libXt-devel) ifelse(GST_ALSA,true,alsa-lib-devel) ifelse(GST_PANGO,true,pango-devel) ifelse(GST_THEORA,true,libtheora-devel) ifelse(GST_LIBVISUAL,true,libvisual-devel) ifelse(GST_OPENGL,true,mesa-libGL-devel)')
+define(`GSTBASE_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc gcc-objc gcc-c++ glib2-devel bison flex gobject-introspection-devel ifelse(GST_XLIB,true,libX11-devel libXv-devel libXt-devel) ifelse(GST_ALSA,true,alsa-lib-devel) ifelse(GST_PANGO,true,libpango1.0-dev) ifelse(GST_THEORA,true,libtheora-devel) ifelse(GST_LIBVISUAL,true,libvisual-devel) ifelse(GST_OPENGL,true,libegl1-mesa)')
 
-define(`GSTBASE_INSTALL_DEPS',`glib2 ifelse(GST_XLIB,true,libX11 libXv libXt) ifelse(GST_ALSA,true,alsa-lib) ifelse(GST_PANGO,true,pango) ifelse(GST_THEORA,true,libtheora) ifelse(GST_LIBVISUAL,true,libvisual) ifelse(GST_OPENGL,true,mesa-libGL)')
+define(`GSTBASE_INSTALL_DEPS',`glib2 mesa-libEGL gobject-introspection ifelse(GST_XLIB,true,libX11 libXv libXt) ifelse(GST_ALSA,true,alsa-lib) ifelse(GST_PANGO,true,pango) ifelse(GST_THEORA,true,libtheora) ifelse(GST_LIBVISUAL,true,libvisual) ifelse(GST_OPENGL,true,mesa-libGL)')
 ')
 
 define(`BUILD_GSTBASE',`
@@ -69,6 +69,7 @@ RUN cd BUILD_HOME/gst-plugins-base-GSTCORE_VER && \
     -Dexamples=disabled \
     -Dtests=disabled \
     -Ddoc=disabled \
+    -Dintrospection=enabled \
     -Dgtk_doc=disabled \
     -Dalsa=ifelse(GST_ALSA,true,enabled,disabled) \
     -Dpango=ifelse(GST_PANGO,true,enabled,disabled) \

diff --git a/template/components/gst-python.m4 b/template/components/gst-python.m4
@@ -31,9 +31,10 @@ dnl
 include(begin.m4)
 
 
-ifelse(OS_NAME,ubuntu,dnl
-`define(`GSTPYTHON_BUILD_DEPS',`ca-certificates tar g++ wget gtk-doc-tools uuid-dev python-gi-dev python3-dev libtool-bin libpython3-dev libpython3-stdlib libpython3-all-dev ')'
-)
+ifelse(OS_NAME,ubuntu,`
+define(`GSTPYTHON_BUILD_DEPS',`ca-certificates tar g++ wget gtk-doc-tools uuid-dev python-gi-dev python3-dev libtool-bin libpython3-dev libpython3-stdlib libpython3-all-dev ')
+define(`GSTPYTHON_INSTALL_DEPS',`python3-numpy libglib2.0-dev')
+')
 
 ifelse(OS_NAME,centos,dnl
 `define(`GSTPYTHON_BUILD_DEPS',`wget tar gcc-c++ glib2-devel gtk-dock openblas python3 python36-gobject-devel python3-devel ifdef(`BUILD_MESON',,meson)')'
@@ -49,7 +50,7 @@ ifelse(OS_VERSION,20.04,
     sed -i "s/.*python\.dependency.*/pythonver \= python\.language_version\(\)\npython_dep \= dependency\(\'python-\@0\@-embed\'\.format\(pythonver\)\, version\: \'\>\=3\'\, required\: false\)\nif not python_dep\.found\(\)\n\tpython_dep \= python\.dependency\(required \: true\)\nendif/g" meson.build && \)
     meson build --libdir=BUILD_LIBDIR --libexecdir=BUILD_LIBDIR \
     --prefix=BUILD_PREFIX --buildtype=plain \
-    -Dpython=/usr/bin/python3 -Dlibpython-dir=/usr/lib/x86_64-linux-gnu/ \
+    -Dpython=/usr/bin/python3 -Dlibpython-dir=ifelse(OS_NAME,centos,/usr/lib64/,/usr/lib/x86_64-linux-gnu/ ) \
     -Dpygi-overrides-dir=/usr/lib/python3/dist-packages/gi/overrides \
     -Dgtk_doc=disabled && \
     cd build && \
@@ -58,6 +59,10 @@ ifelse(OS_VERSION,20.04,
 
 )
 
+define(`INSTALL_GSTPYTHON',
+ifelse(OS_NAME,centos,RUN python3 -m pip install numpy)
+)
+
 REG(GSTPYTHON)
 
 include(end.m4)dnl