Skip to content

Commit 977a008

Browse files
authored
[DLStreamer] Change librdkafka version. (#479)
1 parent 111cf52 commit 977a008

File tree

13 files changed

+87
-46
lines changed

13 files changed

+87
-46
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ endif
2828

2929
export PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/bin:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/bin:${HOME}/.local/bin:${HOME}/python3venv/bin:${PATH}
3030
export GST_PLUGIN_PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/gstreamer-bin/lib/gstreamer-1.0:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/lib:/usr/lib/x86_64-linux-gnu/gstreamer-1.0
31-
export LIBRARY_PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/lib:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/gstreamer-bin/lib:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/opencv-bin/lib:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/lib:/usr/lib
32-
export PKG_CONFIG_PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/lib/pkgconfig:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/gstreamer-bin/lib/pkgconfig:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
31+
export LIBRARY_PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/lib:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/gstreamer-bin/lib:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/opencv-bin/lib:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/rdkafka-bin/lib:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/lib:/usr/lib
32+
export PKG_CONFIG_PATH := ${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/lib/pkgconfig:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/gstreamer-bin/lib/pkgconfig:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/rdkafka-bin/lib/pkgconfig:${PROJECT_DIRECTORY}/build/intel64/${BUILD_TYPE}/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
3333
export LIBVA_DRIVER_NAME := iHD
3434
export LIBVA_DRIVERS_PATH := /usr/lib/x86_64-linux-gnu/dri
3535
export GST_VA_ALL_DRIVERS := 1
@@ -48,9 +48,10 @@ dependencies:
4848
build: dependencies ## Compile Deep Learning Streamer
4949
cmake \
5050
-B build \
51-
-DCMAKE_PREFIX_PATH:PATH="${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install;${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/opencv-bin" \
52-
-DCMAKE_INCLUDE_PATH:PATH=${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/include \
51+
-DCMAKE_PREFIX_PATH:PATH="${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install;${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/opencv-bin;${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/rdkafka-bin" \
52+
-DCMAKE_INCLUDE_PATH:PATH=${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/include:${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/rdkafka-bin/include \
5353
-DCMAKE_LIBRARY_PATH:PATH=${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/install/lib \
54+
-DCMAKE_CXX_FLAGS="-I${PROJECT_DIRECTORY}/${DEPENDENCY_DIR}/rdkafka-bin/include" \
5455
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
5556
-DENABLE_PAHO_INSTALLATION=ON \
5657
-DENABLE_RDKAFKA_INSTALLATION=ON \

dependencies/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ project(dependencies C CXX)
1010
include("ffmpeg.cmake")
1111
include("opencv.cmake")
1212
include("gstreamer.cmake")
13+
include("rdkafka.cmake")

dependencies/rdkafka.cmake

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# ==============================================================================
2+
# Copyright (C) 2025 Intel Corporation
3+
#
4+
# SPDX-License-Identifier: MIT
5+
# ==============================================================================
6+
7+
include(ExternalProject)
8+
9+
# When changing version, you will also need to change the download hash
10+
set(DESIRED_VERSION 2.12.1)
11+
12+
ExternalProject_Add(
13+
rdkafka
14+
PREFIX ${CMAKE_BINARY_DIR}/rdkafka
15+
URL https://github.com/edenhill/librdkafka/archive/v${DESIRED_VERSION}.tar.gz
16+
URL_MD5 86ed3acd2f9d9046250dea654cee59a8
17+
BUILD_IN_SOURCE 1
18+
BUILD_COMMAND make
19+
INSTALL_COMMAND make install
20+
TEST_COMMAND ""
21+
CONFIGURE_COMMAND ./configure
22+
--prefix=${CMAKE_BINARY_DIR}/rdkafka-bin
23+
)
24+
25+
if (INSTALL_DLSTREAMER)
26+
execute_process(COMMAND mkdir -p ${DLSTREAMER_INSTALL_PREFIX}/rdkafka
27+
COMMAND cp -r ${CMAKE_BINARY_DIR}/rdkafka-bin/. ${DLSTREAMER_INSTALL_PREFIX}/rdkafka)
28+
endif()

docker/fedora41/fedora41.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ ENV LD_LIBRARY_PATH=${GSTREAMER_DIR}/lib:${LIBDIR}:/usr/lib:/usr/local/lib:/usr/
398398
ENV LIB_PATH=$LIBDIR
399399
ENV GST_PLUGIN_PATH=${LIBDIR}:${GSTREAMER_DIR}/lib/gstreamer-1.0:/usr/lib64/gstreamer-1.0:${GST_PLUGIN_PATH}
400400
ENV LC_NUMERIC=C
401-
ENV C_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
402-
ENV CPLUS_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
401+
ENV C_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
402+
ENV CPLUS_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
403403
ENV GST_PLUGIN_SCANNER=${GSTREAMER_DIR}/bin/gstreamer-1.0/gst-plugin-scanner
404404
ENV GI_TYPELIB_PATH=${GSTREAMER_DIR}/lib/girepository-1.0
405405
ENV PYTHONPATH=${GSTREAMER_DIR}/lib/python3/dist-packages:${DLSTREAMER_DIR}/python:${PYTHONPATH}

docker/ubuntu/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Replaces: intel-dlstreamer
1010
Multi-Arch: same
1111
Homepage: https://github.com/open-edge-platform/edge-ai-libraries/tree/main/libraries/dl-streamer
1212
Description: Intel(R) Deep Learning Streamer
13-
Depends: ${misc:Depends}, ${shlibs:Depends}, libglib2.0-0t64, libjpeg-turbo8, libdrm2, libwayland-bin, libwayland-client0, libx11-6, libpng16-16t64, libva-drm2, libcurl4t64, libde265-0, libxext6, libva-x11-2, libgl1, libglx-mesa0, libva-wayland2, openexr, libgudev-1.0-0, vainfo, libpython3.12t64, python3, python3-gi, python3-gi-cairo, libcairo2, libvpx9, libopus0, libsrtp2-1, libxv1, libtbb12, libpaho-mqtt1.3, librdkafka1, ffmpeg, libgirepository-1.0-1, libsoup-3.0-0, openvino-2025.3.0
13+
Depends: ${misc:Depends}, ${shlibs:Depends}, libglib2.0-0t64, libjpeg-turbo8, libdrm2, libwayland-bin, libwayland-client0, libx11-6, libpng16-16t64, libva-drm2, libcurl4t64, libde265-0, libxext6, libva-x11-2, libgl1, libglx-mesa0, libva-wayland2, openexr, libgudev-1.0-0, vainfo, libpython3.12t64, python3, python3-gi, python3-gi-cairo, libcairo2, libvpx9, libopus0, libsrtp2-1, libxv1, libtbb12, libpaho-mqtt1.3, ffmpeg, libgirepository-1.0-1, libsoup-3.0-0, openvino-2025.3.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
opt/intel/dlstreamer/ /opt/intel/
22
opt/opencv/ /opt/
3+
opt/rdkafka/ /opt/
34
usr/lib/ /usr
45
opt/librealsense/ /opt/

docker/ubuntu/debian/intel-dlstreamer.install-ubuntu22

Lines changed: 0 additions & 5 deletions
This file was deleted.

docker/ubuntu/ubuntu22.Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ FROM builder AS kafka-builder
307307
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
308308

309309
# Build librdkafka
310-
RUN curl -sSL https://github.com/edenhill/librdkafka/archive/v2.3.0.tar.gz | tar -xz
311-
WORKDIR /librdkafka-2.3.0
310+
RUN curl -sSL https://github.com/edenhill/librdkafka/archive/v2.12.1.tar.gz | tar -xz
311+
WORKDIR /librdkafka-2.12.1
312312
RUN ./configure &&\
313313
make && make install
314314

@@ -398,8 +398,8 @@ ENV LD_LIBRARY_PATH=${GSTREAMER_DIR}/lib:${LIBDIR}:/usr/lib:/usr/local/lib:${LD_
398398
ENV LIB_PATH=$LIBDIR
399399
ENV GST_PLUGIN_PATH=${LIBDIR}:${GSTREAMER_DIR}/lib/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:${GST_PLUGIN_PATH}
400400
ENV LC_NUMERIC=C
401-
ENV C_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
402-
ENV CPLUS_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
401+
ENV C_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
402+
ENV CPLUS_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
403403
ENV GST_PLUGIN_SCANNER=${GSTREAMER_DIR}/bin/gstreamer-1.0/gst-plugin-scanner
404404
ENV GI_TYPELIB_PATH=${GSTREAMER_DIR}/lib/girepository-1.0
405405
ENV PYTHONPATH=${GSTREAMER_DIR}/lib/python3/dist-packages:${DLSTREAMER_DIR}/python:${PYTHONPATH}
@@ -452,8 +452,7 @@ RUN \
452452
cp -rT "${GSTREAMER_DIR}" /deb-pkg/opt/intel/dlstreamer/gstreamer && \
453453
cp -a /usr/local/lib/libopencv*.so* /deb-pkg/opt/opencv/ && \
454454
cp -r /usr/local/include/opencv4/* /deb-pkg/opt/opencv/include && \
455-
cp /usr/local/lib/librdkafka++.so /deb-pkg/opt/rdkafka/librdkafka++.so.1 && \
456-
cp /usr/local/lib/librdkafka.so /deb-pkg/opt/rdkafka/librdkafka.so.1 && \
455+
cp -a /usr/local/lib/librdkafka*.so* /deb-pkg/opt/rdkafka/ && \
457456
cp -a /usr/local/lib/librealsense* /deb-pkg/opt/librealsense/ && \
458457
rm -rf /deb-pkg/opt/intel/dlstreamer/archived && \
459458
rm -rf /deb-pkg/opt/intel/dlstreamer/docker && \
@@ -475,9 +474,7 @@ WORKDIR /deb-pkg
475474

476475
RUN \
477476
rm ./debian/control &&\
478-
rm ./debian/intel-dlstreamer.install && \
479-
mv ./debian/control-ubuntu22 ./debian/control && \
480-
mv ./debian/intel-dlstreamer.install-ubuntu22 ./debian/intel-dlstreamer.install
477+
mv ./debian/control-ubuntu22 ./debian/control
481478

482479
RUN \
483480
debuild -z1 -us -uc && \

docker/ubuntu/ubuntu24.Dockerfile

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
# |
1111
# |
1212
# V
13-
# builder --------------------------
14-
# / \ |
15-
# / \ |
16-
# V | V
17-
# gstreamer-builder opencv-builder realsense-builder
18-
# | | |
19-
# | | |
20-
# (copy libs) \ | (copy libs) |
21-
# \ | |
22-
# V V (copy libs) |
23-
# dlstreamer-dev <-------------------|
13+
# builder -----------------------------------------------
14+
# / \ | |
15+
# / \ | |
16+
# V V | |
17+
# gstreamer-builder opencv-builder V V
18+
# | | kafka-builder realsense-builder
19+
# | | | |
20+
# (copy libs) \ / (copy libs) | |
21+
# \ / | |
22+
# V V (copy libs) | |
23+
# dlstreamer-dev <-------------------|--------------------|
2424
# |
2525
# |
2626
# V
@@ -96,7 +96,7 @@ RUN \
9696
libcairo2-dev=\* libxt-dev=\* libgirepository1.0-dev=\* libgles2-mesa-dev=\* wayland-protocols=\* \
9797
libssh2-1-dev=\* cmake=\* git=\* valgrind=\* numactl=\* libvpx-dev=\* libopus-dev=\* libsrtp2-dev=\* libxv-dev=\* \
9898
linux-libc-dev=\* libpmix2t64=\* libhwloc15=\* libhwloc-plugins=\* libxcb1-dev=\* libx11-xcb-dev=\* \
99-
ffmpeg=\* librdkafka-dev=\* libpaho-mqtt-dev=\* libpostproc-dev=\* libavfilter-dev=\* libavdevice-dev=\* \
99+
ffmpeg=\* libpaho-mqtt-dev=\* libpostproc-dev=\* libavfilter-dev=\* libavdevice-dev=\* \
100100
libswscale-dev=\* libswresample-dev=\* libavutil-dev=\* libavformat-dev=\* libavcodec-dev=\* libxml2-dev=\* libsoup-3.0-0=\* && \
101101
apt-get clean && \
102102
rm -rf /var/lib/apt/lists/*
@@ -305,6 +305,20 @@ RUN \
305305
rm -rf ./* && \
306306
strip -g "${GSTREAMER_DIR}"/lib/gstreamer-1.0/libgstrs*.so
307307

308+
# ==============================================================================
309+
FROM builder AS kafka-builder
310+
311+
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
312+
313+
# Build librdkafka
314+
RUN curl -sSL https://github.com/edenhill/librdkafka/archive/v2.12.1.tar.gz | tar -xz
315+
WORKDIR /librdkafka-2.12.1
316+
RUN ./configure &&\
317+
make && make install
318+
319+
WORKDIR /copy_libs
320+
RUN cp -a /usr/local/lib/librdkafka* ./
321+
308322
# ==============================================================================
309323

310324
FROM builder AS realsense-builder
@@ -342,10 +356,12 @@ FROM builder AS dlstreamer-dev
342356

343357
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
344358

359+
COPY --from=gstreamer-builder ${GSTREAMER_DIR} ${GSTREAMER_DIR}
345360
COPY --from=opencv-builder /usr/local/include/opencv4 /usr/local/include/opencv4
346361
COPY --from=opencv-builder /copy_libs/ /usr/local/lib/
347362
COPY --from=opencv-builder /usr/local/lib/cmake/opencv4 /usr/local/lib/cmake/opencv4
348-
COPY --from=gstreamer-builder ${GSTREAMER_DIR} ${GSTREAMER_DIR}
363+
COPY --from=kafka-builder /usr/local/include/librdkafka /usr/local/include/librdkafka
364+
COPY --from=kafka-builder /copy_libs/ /usr/local/lib/
349365
COPY --from=realsense-builder /copy_libs/ /usr/local/lib/
350366
COPY --from=realsense-builder /usr/local/include/librealsense2 /usr/local/include/librealsense2
351367

@@ -389,8 +405,8 @@ ENV LD_LIBRARY_PATH=${GSTREAMER_DIR}/lib:${LIBDIR}:/usr/lib:/usr/local/lib:${LD_
389405
ENV LIB_PATH=$LIBDIR
390406
ENV GST_PLUGIN_PATH=${LIBDIR}:${GSTREAMER_DIR}/lib/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:${GST_PLUGIN_PATH}
391407
ENV LC_NUMERIC=C
392-
ENV C_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
393-
ENV CPLUS_INCLUDE_PATH=${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
408+
ENV C_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${C_INCLUDE_PATH}
409+
ENV CPLUS_INCLUDE_PATH=/usr/local/include:${DLSTREAMER_DIR}/include:${DLSTREAMER_DIR}/include/dlstreamer/gst/metadata:${CPLUS_INCLUDE_PATH}
394410
ENV GST_PLUGIN_SCANNER=${GSTREAMER_DIR}/bin/gstreamer-1.0/gst-plugin-scanner
395411
ENV GI_TYPELIB_PATH=${GSTREAMER_DIR}/lib/girepository-1.0
396412
ENV PYTHONPATH=${GSTREAMER_DIR}/lib/python3/dist-packages:${DLSTREAMER_DIR}/python:${PYTHONPATH}
@@ -435,6 +451,7 @@ RUN \
435451
mkdir -p /deb-pkg/usr/lib/ && \
436452
mkdir -p /deb-pkg/opt/intel/ && \
437453
mkdir -p /deb-pkg/opt/opencv/include && \
454+
mkdir -p /deb-pkg/opt/rdkafka && \
438455
mkdir -p /deb-pkg/opt/librealsense/ && \
439456
find /opt/intel/openvino_genai -regex '.*\/lib.*\(genai\|token\).*$' -exec cp -a {} /deb-pkg/usr/lib/ \; && \
440457
cp -r "${DLSTREAMER_DIR}/build/intel64/${BUILD_ARG}" /deb-pkg/opt/intel/dlstreamer && \
@@ -446,6 +463,7 @@ RUN \
446463
cp -rT "${GSTREAMER_DIR}" /deb-pkg/opt/intel/dlstreamer/gstreamer && \
447464
cp -a /usr/local/lib/libopencv*.so* /deb-pkg/opt/opencv/ && \
448465
cp -r /usr/local/include/opencv4/* /deb-pkg/opt/opencv/include && \
466+
cp -a /usr/local/lib/librdkafka*.so* /deb-pkg/opt/rdkafka/ && \
449467
cp -a /usr/local/lib/librealsense* /deb-pkg/opt/librealsense/ && \
450468
rm -rf /deb-pkg/opt/intel/dlstreamer/archived && \
451469
rm -rf /deb-pkg/opt/intel/dlstreamer/docker && \
@@ -537,7 +555,7 @@ RUN \
537555
# DL Streamer environment variables
538556
ENV LIBVA_DRIVER_NAME=iHD
539557
ENV GST_PLUGIN_PATH=/opt/intel/dlstreamer/lib:/opt/intel/dlstreamer/gstreamer/lib/gstreamer-1.0:/opt/intel/dlstreamer/gstreamer/lib/
540-
ENV LD_LIBRARY_PATH=/opt/intel/dlstreamer/gstreamer/lib:/opt/intel/dlstreamer/lib:/opt/intel/dlstreamer/lib/gstreamer-1.0:/opt/opencv:/opt/librealsense:/usr/lib:/usr/local/lib/gstreamer-1.0:/usr/local/lib
558+
ENV LD_LIBRARY_PATH=/opt/intel/dlstreamer/gstreamer/lib:/opt/intel/dlstreamer/lib:/opt/intel/dlstreamer/lib/gstreamer-1.0:/opt/opencv:/opt/rdkafka:/opt/librealsense:/usr/local/lib/gstreamer-1.0:/usr/local/lib
541559
ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
542560
ENV GST_VA_ALL_DRIVERS=1
543561
ENV MODEL_PROC_PATH=/opt/intel/dlstreamer/samples/gstreamer/model_proc

0 commit comments

Comments
 (0)