Commit 241a408d42 for freeswitch.com
commit 241a408d42d8ce28f4db8df3a9ddf57fa184306b
Author: Andrey Volk <andywolk@gmail.com>
Date: Wed Sep 16 14:26:56 2026 +0300
[Build-System] Windows: Upgrade opencv to v4.10.0_1, pcre (PCRE2) to v10.48_1 (#3172)
diff --git a/.gitignore b/.gitignore
index 1b35bd14dc..400e1e196d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,6 +272,10 @@ libs/mariadb-connector-c-*/
libs/mariadb-connector-c-*.zip
libs/flite-*/
libs/flite-*.zip
+libs/pcre-*/
+libs/pcre-*.zip
+libs/opencv-*/
+libs/opencv-*.zip
libs/lua-*.zip
libs/SharpZipLib.*/
libs/SharpZipLib.*.nupkg
diff --git a/w32/opencv-version.props b/w32/opencv-version.props
index 681e44ac01..4c27055c31 100644
--- a/w32/opencv-version.props
+++ b/w32/opencv-version.props
@@ -4,7 +4,8 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <opencvVersion>3.4.1</opencvVersion>
+ <opencvVersion>4.10.0</opencvVersion>
+ <opencvBuildNumber>1</opencvBuildNumber>
</PropertyGroup>
<PropertyGroup>
<opencvVersionImported>true</opencvVersionImported>
diff --git a/w32/opencv.props b/w32/opencv.props
index ef415cb763..2c586285a7 100644
--- a/w32/opencv.props
+++ b/w32/opencv.props
@@ -11,12 +11,12 @@
<PropertyGroup>
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
- <OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">opencv_world341d</OpenCVLibraryFileName>
- <OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">opencv_world341</OpenCVLibraryFileName>
+ <OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">opencv_world4100d</OpenCVLibraryFileName>
+ <OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">opencv_world4100</OpenCVLibraryFileName>
</PropertyGroup>
<PropertyGroup Label="UserMacros">
- <opencvLibDir>$(BaseDir)libs\opencv-$(opencvVersion)</opencvLibDir>
+ <opencvLibDir>$(BaseDir)libs\opencv-$(opencvVersion)_$(opencvBuildNumber)</opencvLibDir>
</PropertyGroup>
<!--
@@ -41,7 +41,7 @@
<Target Name="opencvBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="http://files.freeswitch.org/windows/packages/opencv/$(opencvVersion)/opencv-$(opencvVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+ package="https://github.com/freeswitch/windows-deps/releases/download/opencv-v$(opencvVersion)_$(opencvBuildNumber)/opencv-$(opencvVersion)_$(opencvBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
expectfileordirectory="$(opencvLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(OpenCVLibraryFileName).lib"
outputfolder=""
outputfilename=""
@@ -50,8 +50,8 @@
</Target>
<Target Name="opencvHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="http://files.freeswitch.org/windows/packages/opencv/$(opencvVersion)/opencv-$(opencvVersion)-headers.zip"
- expectfileordirectory="$(opencvLibDir)\include\opencv\cv.h"
+ package="https://github.com/freeswitch/windows-deps/releases/download/opencv-v$(opencvVersion)_$(opencvBuildNumber)/opencv-$(opencvVersion)_$(opencvBuildNumber)-headers.zip"
+ expectfileordirectory="$(opencvLibDir)\include\opencv2\opencv.hpp"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
@@ -70,10 +70,10 @@
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(opencvLibDir)\include\;$(opencvLibDir)\include\opencv\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(opencvLibDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(SolutionDir)libs\opencv-$(opencvVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)libs\opencv-$(opencvVersion)_$(opencvBuildNumber)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(OpenCVLibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
diff --git a/w32/pcre-version.props b/w32/pcre-version.props
index bfa6de553f..999d810671 100644
--- a/w32/pcre-version.props
+++ b/w32/pcre-version.props
@@ -4,7 +4,8 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <pcreVersion>10.45</pcreVersion>
+ <pcreVersion>10.48</pcreVersion>
+ <pcreBuildNumber>1</pcreBuildNumber>
</PropertyGroup>
<PropertyGroup>
<pcreVersionImported>true</pcreVersionImported>
diff --git a/w32/pcre.props b/w32/pcre.props
index 6a241184bb..2a87da531a 100644
--- a/w32/pcre.props
+++ b/w32/pcre.props
@@ -17,7 +17,7 @@
</PropertyGroup>
<PropertyGroup Label="UserMacros">
- <pcreLibDir>$(BaseDir)libs\pcre-$(pcreVersion)</pcreLibDir>
+ <pcreLibDir>$(BaseDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)</pcreLibDir>
</PropertyGroup>
<!--
@@ -42,7 +42,7 @@
<Target Name="pcreBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="http://files.freeswitch.org/windows/packages/pcre/$(pcreVersion)/pcre-$(pcreVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+ package="https://github.com/freeswitch/windows-deps/releases/download/pcre-v$(pcreVersion)_$(pcreBuildNumber)/pcre-$(pcreVersion)_$(pcreBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
expectfileordirectory="$(pcreLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(PCRELibraryFileName).lib"
outputfolder=""
outputfilename=""
@@ -51,7 +51,7 @@
</Target>
<Target Name="pcreHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="http://files.freeswitch.org/windows/packages/pcre/$(pcreVersion)/pcre-$(pcreVersion)-headers.zip"
+ package="https://github.com/freeswitch/windows-deps/releases/download/pcre-v$(pcreVersion)_$(pcreBuildNumber)/pcre-$(pcreVersion)_$(pcreBuildNumber)-headers.zip"
expectfileordirectory="$(pcreLibDir)\include\pcre2.h"
outputfolder=""
outputfilename=""
@@ -71,11 +71,11 @@
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(pcreVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(SolutionDir)libs\pcre-$(pcreVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(PCRELibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>