diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-09-03 09:01:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 18:01:14 -0700 |
| commit | 8db63fc1157367a39f94c4f8a72376430c21a965 (patch) | |
| tree | 474e2f630c645b1897c378cbb262527ad60ccd21 /ports/pangolin/add-definition.patch | |
| parent | 7e7bcf89171b7ed84ece845b1fa596a018e462f2 (diff) | |
| download | vcpkg-8db63fc1157367a39f94c4f8a72376430c21a965.tar.gz vcpkg-8db63fc1157367a39f94c4f8a72376430c21a965.zip | |
[pangolin] Update to 0.6 and also support osx (#19840)
* [pangolin] Update to 0.6
* Update version files
* Format manifest
* Revert to CRLF in original patches
* Update versions/p-/pangolin.json
* Support osx and add features
* Remove extra space line
* Update versions/p-/pangolin.json
* Remove unused options
* Update versions/p-/pangolin.json
* Add MAYBE_UNUSED_VARIABLES
* Update versions/p-/pangolin.json
Diffstat (limited to 'ports/pangolin/add-definition.patch')
| -rw-r--r-- | ports/pangolin/add-definition.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ports/pangolin/add-definition.patch b/ports/pangolin/add-definition.patch index 02790216e..ce27d4b33 100644 --- a/ports/pangolin/add-definition.patch +++ b/ports/pangolin/add-definition.patch @@ -1,13 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9e0baac..bb3ef76 100644 +index 49dcf02..d448928 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() +@@ -384,6 +384,7 @@ endif() -+add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) -+ - find_package(FFMPEG QUIET) - if(BUILD_PANGOLIN_VIDEO AND FFMPEG_FOUND) - set(HAVE_FFMPEG 1) + option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON) + if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO) ++ add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) + find_package(FFMPEG QUIET) + if(FFMPEG_FOUND) + set(HAVE_FFMPEG 1) |