[ffmpeg] avdevice xcb linking fix on linux (#17467)

* [ffmpeg] avdevice depends on xcb on linux * [ffmpeg] bump port version * [ffmpeg] x-add-version
microsoft · Apr 28, 2021 · d0f18bb · d0f18bb
1 parent a679cdd
commit d0f18bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.3.2
-Port-Version: 5
+Port-Version: 6
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.

diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -331,6 +331,9 @@ endif()
 if(UNIX AND NOT APPLE)
   list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -lX11)
   find_platform_dependent_optional_libraries(NAMES va-drm va vdpau)
+  if(@ENABLE_AVDEVICE@)
+    find_platform_dependent_optional_libraries(NAMES xcb xcb-shm xcb-shape xcb-xfixes)
+  endif()
 endif()
 
 if(WIN32)

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1950,7 +1950,7 @@
     },
     "ffmpeg": {
       "baseline": "4.3.2",
-      "port-version": 5
+      "port-version": 6
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a6d19d895b8c522d7d1179d93ae1e9386ac38ac2",
+      "version-string": "4.3.2",
+      "port-version": 6
+    },
     {
       "git-tree": "68f6d071ba23bf8ad28a12a507c8089a47a76d73",
       "version-string": "4.3.2",