diff options
| author | wangqr <wangqr@users.noreply.github.com> | 2020-06-10 21:04:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 18:04:32 -0700 |
| commit | 1509b14bb3e100ff579bc42c5923ed2871467844 (patch) | |
| tree | a4d15b19f21e4cf290ab509216c36e469a86bc66 | |
| parent | 473e54820731eae43b745f65240838aaaf88c9cf (diff) | |
| download | vcpkg-1509b14bb3e100ff579bc42c5923ed2871467844.tar.gz vcpkg-1509b14bb3e100ff579bc42c5923ed2871467844.zip | |
[avisynthplus] Upgrade to 3.6.0 (#11736)
* [avisynthplus] Upgrade to 3.6.0
AviSynth+ also supports linux and macOS now
* [avisynthplus] Allow x64-linux build fail on CI
AviSynth+ requires C++17 to build correctly. C++17 std::filesystem is not available in gcc 7.5 used in CI.
| -rw-r--r-- | ports/avisynthplus/CONTROL | 4 | ||||
| -rw-r--r-- | ports/avisynthplus/generate-version-3.5.patch | 20 | ||||
| -rw-r--r-- | ports/avisynthplus/portfile.cmake | 8 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
4 files changed, 6 insertions, 27 deletions
diff --git a/ports/avisynthplus/CONTROL b/ports/avisynthplus/CONTROL index 21d9c5586..362eaaed9 100644 --- a/ports/avisynthplus/CONTROL +++ b/ports/avisynthplus/CONTROL @@ -1,5 +1,5 @@ Source: avisynthplus -Version: 3.5.0 +Version: 3.6.0 Homepage: http://avs-plus.net/ Description: An improved version of the AviSynth frameserver, with improved features and developer friendliness -Supports: windows&!(uwp|arm|static) +Supports: !(uwp|arm|static) diff --git a/ports/avisynthplus/generate-version-3.5.patch b/ports/avisynthplus/generate-version-3.5.patch deleted file mode 100644 index f29cbf463..000000000 --- a/ports/avisynthplus/generate-version-3.5.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/avs_core/Version.cmake b/avs_core/Version.cmake -index e2be19d2..1d4dd922 100644 ---- a/avs_core/Version.cmake -+++ b/avs_core/Version.cmake -@@ -1,12 +1,4 @@ --EXECUTE_PROCESS( -- COMMAND "${GIT}" --git-dir=${REPO}/.git rev-list --count HEAD -- OUTPUT_VARIABLE AVS_SEQREV -- OUTPUT_STRIP_TRAILING_WHITESPACE --) --EXECUTE_PROCESS( -- COMMAND "${GIT}" --git-dir=${REPO}/.git rev-parse --abbrev-ref HEAD -- OUTPUT_VARIABLE AVS_BRANCH -- OUTPUT_STRIP_TRAILING_WHITESPACE --) -+set(AVS_SEQREV 3043) -+set(AVS_BRANCH 3.5) - CONFIGURE_FILE(${SRC} ${DST} @ONLY) - -\ No newline at end of file diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index 232a5d0ac..d18d548a0 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,15 +1,13 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" "arm" "arm64") +vcpkg_fail_port_install(ON_TARGET "UWP" "arm" "arm64") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus - REF e17f4f80055009bf45b37e1b6d1790bd1c1a93b2 # 3.5.0 - SHA512 40d2f63416e0e812dd6c7db9b17c09c51295d192bdc4dc46daa063e20731a3451a2b797dab351d31dbb43842eb2c2cdb148da16e5b92816423e3cbf40fff23b0 + REF v3.6.0 + SHA512 040e9f2c99973eb96b0f1ba373627c3c43ff17ed8339ea850aebc2306228384175cb37c418a139f865c396c70c2d254cd8a40838f577f184a4c161b258328dd5 HEAD_REF master - PATCHES - generate-version-3.5.patch ) vcpkg_configure_cmake( diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08abb6681..bd821958d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -92,6 +92,7 @@ atlmfc:x64-linux=fail atlmfc:x64-osx=fail
aubio:x64-linux=fail
aubio:x64-osx=fail
+avisynthplus:x64-linux=fail
avisynthplus:x64-windows-static=fail
avro-c:arm-uwp=fail
avro-c:x64-osx=fail
|