revert pangolin commit

Sibras · Sibras · commit f59bc5a53ea7 · 2021-03-15T16:54:48.000+11:00
Reverts most of 2543be2
diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 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/add-definition.patch b/ports/pangolin/add-definition.patch
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
@@ -13,12 +13,10 @@ vcpkg_from_github(
         fix-includepath-error.patch # include path has one more ../
         fix-dependeny-ffmpeg.patch
         fix-dependency-python.patch
-        add-definition.patch
         fix-cmake-version.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/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "76c6e8bad0d822c842f04ccd587df72a2382ed9c",
+      "git-tree": "5cfc1d9db800824b0602e9bd60282353900c6fd2",
       "version-string": "4.3.1",
       "port-version": 13
     },
diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9c7553f917113e488bd1a811fff8a4074aeb48b8",
+      "git-tree": "1e42591924a8a57c2103f4cc093032e8c006cf1f",
       "version-string": "0.5",
       "port-version": 13
     },

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
`3`	`3`	`{`
`4`		`- "git-tree": "76c6e8bad0d822c842f04ccd587df72a2382ed9c",`
	`4`	`+ "git-tree": "5cfc1d9db800824b0602e9bd60282353900c6fd2",`
`5`	`5`	`"version-string": "4.3.1",`
`6`	`6`	`"port-version": 13`
`7`	`7`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
`3`	`3`	`{`
`4`		`- "git-tree": "9c7553f917113e488bd1a811fff8a4074aeb48b8",`
	`4`	`+ "git-tree": "1e42591924a8a57c2103f4cc093032e8c006cf1f",`
`5`	`5`	`"version-string": "0.5",`
`6`	`6`	`"port-version": 13`
`7`	`7`	`},`