diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-03-12 04:14:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 12:14:34 -0800 |
| commit | 2543be2edf60bf38511c2d477bb17b617398a108 (patch) | |
| tree | fadea369f0375b22adf71ec594aacb8af23a5328 /ports/pangolin/fix-dependeny-ffmpeg.patch | |
| parent | f2ae282c8d7c2a4a5a8e2b88ae42723261b7b298 (diff) | |
| download | vcpkg-2543be2edf60bf38511c2d477bb17b617398a108.tar.gz vcpkg-2543be2edf60bf38511c2d477bb17b617398a108.zip | |
[pangolin] Fix static build error (#15593)
* [pangolin] Fix static build error
* Update versions
* Update dependency for pangolin
* Update pangolin.json
Diffstat (limited to 'ports/pangolin/fix-dependeny-ffmpeg.patch')
| -rw-r--r-- | ports/pangolin/fix-dependeny-ffmpeg.patch | 50 |
1 files changed, 0 insertions, 50 deletions
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) - |