diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-11-19 21:33:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 12:33:04 -0800 |
| commit | 678e3057d60fe426dcc589f9fdcbb666b61e8604 (patch) | |
| tree | c5408b3e8a7da46cad17f03c3aafa9726a099c93 | |
| parent | dd8d436fb03565d6de0a9c5deea228ccad084193 (diff) | |
| download | vcpkg-678e3057d60fe426dcc589f9fdcbb666b61e8604.tar.gz vcpkg-678e3057d60fe426dcc589f9fdcbb666b61e8604.zip | |
[libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (#14626)
* fix iconv naming in ffmpeg
* libpq fix features
| -rw-r--r-- | ports/ffmpeg/0007-fix-lib-naming.patch | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/patches/windows/Solution_Debug.patch | 4 | ||||
| -rw-r--r-- | ports/libpq/patches/windows/Solution_Release.patch | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ports/ffmpeg/0007-fix-lib-naming.patch b/ports/ffmpeg/0007-fix-lib-naming.patch index c9fb9db21..7e4aa7102 100644 --- a/ports/ffmpeg/0007-fix-lib-naming.patch +++ b/ports/ffmpeg/0007-fix-lib-naming.patch @@ -8,7 +8,7 @@ index d6c4388..75b96c3 100644 -lx264) echo libx264.lib ;; + -lx265) echo libx265.lib ;; + -lmp3lame) echo libmp3lame.lib ;; -+ -liconv) echo libiconv.lib ;; ++ -liconv) echo iconv.lib ;; + -lm) ;; -lstdc++) ;; -l*) echo ${flag#-l}.lib ;; diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 4ea0d0400..0667d8822 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 7 +Port-Version: 8 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/libpq/CONTROL b/ports/libpq/CONTROL index f55423ec5..9087debee 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 8 +Port-Version: 9 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/patches/windows/Solution_Debug.patch b/ports/libpq/patches/windows/Solution_Debug.patch index 07e57497b..e641f468a 100644 --- a/ports/libpq/patches/windows/Solution_Debug.patch +++ b/ports/libpq/patches/windows/Solution_Debug.patch @@ -93,7 +93,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\libintl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated } if ($self->{options}->{gss}) { @@ -110,7 +110,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\libiconv.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated } if ($self->{options}->{icu}) { diff --git a/ports/libpq/patches/windows/Solution_Release.patch b/ports/libpq/patches/windows/Solution_Release.patch index e4b653c7a..cc41b8d0b 100644 --- a/ports/libpq/patches/windows/Solution_Release.patch +++ b/ports/libpq/patches/windows/Solution_Release.patch @@ -93,7 +93,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated } if ($self->{options}->{gss}) { @@ -110,7 +110,7 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\libiconv.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated } if ($self->{options}->{icu}) { |