mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 23:08:35 +00:00
[Build-System] Windows: Upgrade FFmpeg to v8.1.3_1 and openh264 to 2.7.0, take FFmpeg from windows-deps (#3251)
This commit is contained in:
1 parent
9fdd2cdfaf
commit
f37a27f2f4
4 files changed
+9
-7
No files matched your search
@@ -19,7 +19,7 @@ namespace Setup.CA.DownloadOpenH264
|
||||
|
||||
try
|
||||
{
|
||||
WebRequest request = HttpWebRequest.Create("http://ciscobinary.openh264.org/openh264-1.8.0-win64.dll.bz2");
|
||||
WebRequest request = HttpWebRequest.Create("http://ciscobinary.openh264.org/openh264-2.7.0-win64.dll.bz2");
|
||||
|
||||
using (WebResponse response = request.GetResponse())
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
<Target Name="openh264DownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="http://ciscobinary.openh264.org/openh264-1.8.0-win64.dll.bz2"
|
||||
package="http://ciscobinary.openh264.org/openh264-2.7.0-win64.dll.bz2"
|
||||
expectfileordirectory="$(BaseDir)$(Platform)\$(SolutionConfiguration)\openh264.dll"
|
||||
outputfolder=""
|
||||
outputfilename="openh264.dll.bz2"
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<ffmpegVersion>7.1.5</ffmpegVersion>
|
||||
<ffmpegVersion>8.1.3</ffmpegVersion>
|
||||
<ffmpegBuildNumber>1</ffmpegBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ffmpegVersionImported>true</ffmpegVersionImported>
|
||||
|
||||
+5
-4
@@ -17,15 +17,16 @@
|
||||
<ffmpegConfigName>$([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '-.*$', ''))</ffmpegConfigName>
|
||||
<ffmpegVariant>$([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '^.*-', ''))</ffmpegVariant>
|
||||
|
||||
<ffmpegDir>$(BaseDir)libs\ffmpeg-$(ffmpegVersion)</ffmpegDir>
|
||||
<ffmpegPkg>ffmpeg-$(ffmpegVersion)_$(ffmpegBuildNumber)</ffmpegPkg>
|
||||
<ffmpegDir>$(BaseDir)libs\$(ffmpegPkg)</ffmpegDir>
|
||||
<ffmpegBinDir>$(ffmpegDir)\binaries\$(ffmpegVariant)\$(Platform)\$(ffmpegConfigName)</ffmpegBinDir>
|
||||
<ffmpegPkgBase>https://github.com/freeswitch/ffmpeg-packaging/releases/download/ffmpeg-v$(ffmpegVersion)</ffmpegPkgBase>
|
||||
<ffmpegPkgBase>https://github.com/freeswitch/windows-deps/releases/download/ffmpeg-v$(ffmpegVersion)_$(ffmpegBuildNumber)</ffmpegPkgBase>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Download + extract the headers (config-independent). -->
|
||||
<Target Name="ffmpegHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="$(ffmpegPkgBase)/ffmpeg-$(ffmpegVersion)-headers.zip"
|
||||
package="$(ffmpegPkgBase)/$(ffmpegPkg)-headers.zip"
|
||||
expectfileordirectory="$(ffmpegDir)\include\libavcodec\avcodec.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -36,7 +37,7 @@
|
||||
<!-- Download + extract the per-variant, per-config binaries (DLLs + import libs). -->
|
||||
<Target Name="ffmpegBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="$(ffmpegPkgBase)/ffmpeg-$(ffmpegVersion)-$(ffmpegVariant)-binaries-$(Platform.ToLower())-$(ffmpegConfigName.ToLower()).zip"
|
||||
package="$(ffmpegPkgBase)/$(ffmpegPkg)-$(ffmpegVariant)-binaries-$(Platform.ToLower())-$(ffmpegConfigName.ToLower()).zip"
|
||||
expectfileordirectory="$(ffmpegBinDir)\avcodec.lib"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
Reference in new issue
Block a user