[pangolin] Fix static build error (#15593)

* [pangolin] Fix static build error

* Update versions

* Update dependency for pangolin

* Update pangolin.json

4 files changed, 17 insertions, 53 deletions

diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index b27c40d4d..7d29b2e2d 100644
--- 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
new file mode 100644
index 000000000..02790216e
--- /dev/null
+++ 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
deleted file mode 100644
index bb1581e4f..000000000
--- a/ports/pangolin/fix-dependeny-ffmpeg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/CMakeModules/FindFFMPEG.cmake b/CMakeModules/FindFFMPEG.cmake
-index 4f77e5a..151762f 100644
---- a/CMakeModules/FindFFMPEG.cmake
-+++ b/CMakeModules/FindFFMPEG.cmake
-@@ -21,6 +21,14 @@ FIND_PATH(
-   SWSCALE_INCLUDE_DIR libswscale/swscale.h
-   /usr/include /usr/local/include /opt/local/include
- )
-+FIND_PATH(
-+  AVDEVICE_INCLUDE_DIR libavdevice/avdevice.h
-+  /usr/include /usr/local/include /opt/local/include
-+)
-+FIND_PATH(
-+  SWRESAMPLE_INCLUDE_DIR libswresample/swresample.h
-+  /usr/include /usr/local/include /opt/local/include
-+)
- 
- # Find Library files
- FIND_LIBRARY(
-@@ -43,15 +51,28 @@ FIND_LIBRARY(
-   NAMES swscale
-   PATH /usr/lib /usr/local/lib /opt/local/lib
- )
-+FIND_LIBRARY(
-+  AVDEVICE_LIBRARY
-+  NAMES avdevice
-+  PATH /usr/lib /usr/local/lib /opt/local/lib
-+)
-+FIND_LIBRARY(
-+  SWRESAMPLE_LIBRARY
-+  NAMES swresample
-+  PATH /usr/lib /usr/local/lib /opt/local/lib
-+)
- 
- IF( EXISTS "${AVUTIL_INCLUDE_DIR}/libavutil/pixdesc.h" )
-   SET( AVUTIL_HAVE_PIXDESC TRUE)
- endif()
- 
- IF(AVCODEC_INCLUDE_DIR AND AVFORMAT_INCLUDE_DIR AND AVUTIL_INCLUDE_DIR AND SWSCALE_INCLUDE_DIR AND AVCODEC_LIBRARY AND AVFORMAT_LIBRARY AND AVUTIL_LIBRARY AND SWSCALE_LIBRARY AND AVUTIL_HAVE_PIXDESC)
-+   IF (WIN32)
-+      SET(AVFORMAT_LIBRARY ${AVFORMAT_LIBRARY} Ws2_32 Secur32 Bcrypt strmiids mfplat mfuuid)
-+   ENDIF()
-    SET(FFMPEG_FOUND TRUE)
--   SET(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
--   SET(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
-+   SET(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARY} ${AVDEVICE_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY} ${SWRESAMPLE_LIBRARY})
-+   SET(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR} ${AVDEVICE_INCLUDE_DIR} ${SWRESAMPLE_INCLUDE_DIR})
- 
-    include(CheckCXXSourceCompiles)
- 
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 79080b126..303e697b4 100644
--- 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)