aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-02 10:35:27 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-03-02 10:35:27 -0800
commit6c26a42d54e30a22bc1c3a455646242e23e2f0df (patch)
tree204f9949c42345e63dabc0be9ff7508d80004894
parent782fa3000b42fafc5ed96adbeaa5295b1fb776db (diff)
downloadvcpkg-6c26a42d54e30a22bc1c3a455646242e23e2f0df.tar.gz
vcpkg-6c26a42d54e30a22bc1c3a455646242e23e2f0df.zip
[ffmpeg] Disable static building.
-rw-r--r--ports/ffmpeg/CONTROL2
-rw-r--r--ports/ffmpeg/portfile.cmake5
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index d1db97c20..eea91d568 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,4 +1,4 @@
Source: ffmpeg
-Version: 3.2.4-1
+Version: 3.2.4-2
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. \ No newline at end of file
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index b9d795b20..7b45fc898 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -1,3 +1,8 @@
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ message(STATUS "Building as static libraries not currently supported. Building as DLLs instead.")
+ set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-3.2.4)
vcpkg_download_distfile(ARCHIVE