aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2020-10-30 21:51:50 +0000
committerGitHub <noreply@github.com>2020-10-30 14:51:50 -0700
commit057177cfa3e3a472ce27b9d41f125ae0893782f6 (patch)
tree8ee532c5921bbf1546fe910152ba256dbdd43217
parent0075e27a9b6b169daf925a591c16db290c549791 (diff)
downloadvcpkg-057177cfa3e3a472ce27b9d41f125ae0893782f6.tar.gz
vcpkg-057177cfa3e3a472ce27b9d41f125ae0893782f6.zip
[ffmpeg] fix mp3lame feature linking on x64-linux (#14266)
-rw-r--r--ports/ffmpeg/CONTROL2
-rw-r--r--ports/ffmpeg/FindFFMPEG.cmake.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 01c42182b..1577bd72e 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
Source: ffmpeg
Version: 4.3.1
-Port-Version: 3
+Port-Version: 4
Homepage: https://ffmpeg.org
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.
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
index 6e667ab9c..d7cca261f 100644
--- a/ports/ffmpeg/FindFFMPEG.cmake.in
+++ b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -93,7 +93,7 @@ endif()
if(@ENABLE_LAME@)
find_dependency(mp3lame)
- select_library_configurations_from_targets(BASENAME mp3lame TARGETS mp3lame::mp3lame mp3lame::mpghip)
+ select_library_configurations_from_targets(BASENAME mp3lame TARGETS mp3lame::mp3lame)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${mp3lame_LIBRARIES})
endif()