[pangolin] Fix static build error (#15593)

* [pangolin] Fix static build error * Update versions * Update dependency for pangolin * Update pangolin.json
microsoft · Mar 11, 2021 · 2543be2 · 2543be2
1 parent f2ae282
commit 2543be2
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 56 deletions.
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.3.1
-Port-Version: 11
+Port-Version: 12
 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/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake
@@ -1,6 +1,8 @@
 set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
+cmake_policy(SET CMP0012 NEW)
+
 _find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH})
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
@@ -1,7 +1,7 @@
 Source: pangolin
 Version: 0.5
-Port-Version: 11
-Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
+Port-Version: 12
+Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg[avformat]
 Homepage: https://github.com/stevenlovegrove/Pangolin
 Description: Lightweight GUI Library
 Supports: !uwp & !osx
diff --git a/ports/pangolin/add-definition.patch b/ports/pangolin/add-definition.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e0baac..bb3ef76 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -287,6 +287,8 @@ if(BUILD_PANGOLIN_VIDEO AND _LINUX_)
+   message(STATUS "V4L Found and Enabled")
+ endif()
+
++add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT)
++
+ find_package(FFMPEG QUIET)
+ if(BUILD_PANGOLIN_VIDEO AND FFMPEG_FOUND)
+   set(HAVE_FFMPEG 1)
diff --git a/ports/pangolin/fix-dependeny-ffmpeg.patch b/ports/pangolin/fix-dependeny-ffmpeg.patch
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
@@ -11,11 +11,12 @@ vcpkg_from_github(
     PATCHES
         deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library
         fix-includepath-error.patch # include path has one more ../
-        fix-dependeny-ffmpeg.patch
         fix-dependency-python.patch
+        add-definition.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake)
+file(REMOVE ${SOURCE_PATH}/CMakeModules/FindFFMPEG.cmake)
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT)
 

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1922,7 +1922,7 @@
     },
     "ffmpeg": {
       "baseline": "4.3.1",
-      "port-version": 11
+      "port-version": 12
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
@@ -4498,7 +4498,7 @@
     },
     "pangolin": {
       "baseline": "0.5",
-      "port-version": 11
+      "port-version": 12
     },
     "pangomm": {
       "baseline": "2.40.1",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15e92ca783e70105ccbf4fda0225a2587a760fe9",
+      "version-string": "4.3.1",
+      "port-version": 12
+    },
     {
       "git-tree": "985bdde5191e69e38ecda3472663614fcd491052",
       "version-string": "4.3.1",

diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a27ee268db34edfd09ce5d0b51e574c7e6719931",
+      "version-string": "0.5",
+      "port-version": 12
+    },
     {
       "git-tree": "4632fbe85a4a6afb145b500f689fe47b99b45c71",
       "version-string": "0.5",