3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (#14626)

Browse Source 
* fix iconv naming in ffmpeg

* libpq fix features
This commit is contained in:
Alexander Neumann 2020-11-19 21:33:04 +01:00 committed by GitHub
parent dd8d436fb0
commit 678e3057d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/0007-fix-lib-naming.patch
View File

@ -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 ;;

2
ports/ffmpeg/CONTROL
View File

@ -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.

2
ports/libpq/CONTROL
View File

@ -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/

4
ports/libpq/patches/windows/Solution_Debug.patch
View File

@ -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})
{

4
ports/libpq/patches/windows/Solution_Release.patch
View File

@ -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})
{