Merge branch '4.0release' into develop

winlinvip · winlinvip · commit 29ae29c693fa · 2022-08-29T19:24:17.000+08:00
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
@@ -35,6 +35,12 @@ RUN cp -R conf /usr/local/srs/conf && \
     cp -R research/players /usr/local/srs/objs/nginx/html/ && \
     cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
 
+# Copy the shared libraries for FFmpeg.
+RUN mkdir -p /usr/local/shared && \
+    cp $(ldd /usr/local/bin/ffmpeg |grep libxml2 |awk '{print $3}') /usr/local/shared/ && \
+    cp $(ldd /usr/local/bin/ffmpeg |grep libicuuc |awk '{print $3}') /usr/local/shared/ && \
+    cp $(ldd /usr/local/bin/ffmpeg |grep libicudata |awk '{print $3}') /usr/local/shared/
+
 ############################################################
 # dist
 ############################################################
@@ -48,10 +54,17 @@ RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM"
 EXPOSE 1935 1985 8080 8000/udp 10080/udp
 
 # FFMPEG 4.1
+COPY --from=build /usr/local/shared/* /lib/
 COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
 # SRS binary, config files and srs-console.
 COPY --from=build /usr/local/srs /usr/local/srs
 
+# Test the version of binaries.
+RUN ldd /usr/local/srs/objs/ffmpeg/bin/ffmpeg && \
+    /usr/local/srs/objs/ffmpeg/bin/ffmpeg -version && \
+    ldd /usr/local/srs/objs/srs && \
+    /usr/local/srs/objs/srs -v
+
 # Default workdir and command.
 WORKDIR /usr/local/srs
 CMD ["./objs/srs", "-c", "conf/docker.conf"]
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -54,6 +54,7 @@ The changelog for SRS.
 
 ## SRS 4.0 Changelog
 
+* v4.0, 2022-08-29, Copy libxml2-dev for FFmpeg. v4.0.258
 * v4.0, 2022-08-24, STAT: Support config server_id and generate one if empty. v4.0.257
 * v4.0, 2022-08-24, For [#2136](https://github.com/ossrs/srs/issues/2136): API: Cleanup no active streams for statistics. v4.0.256
 * v4.0, 2022-08-17, RTMP URL supports domain in stream parameters. v4.0.255
diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    257
+#define VERSION_REVISION    258
 
 #endif
