Skip to content
Snippets Groups Projects
Commit 120eb26b authored by Sébastien Blin's avatar Sébastien Blin
Browse files

misc: bump pjproject to 2.12

Change-Id: Ic8576fbb9633d768cdb6ac5e895e954ee460aa05
parent 68bb1e83
Branches
No related tags found
No related merge requests found
From c8dfc738005dbc44975855cca8ac626af0f4ca4d Mon Sep 17 00:00:00 2001
From: jrun <darwinskernel@gmail.com>
Date: Thu, 27 Feb 2020 14:40:07 -0500
Subject: [PATCH 2/3] win vs gnutls
---
pjlib/build/pjlib.vcxproj | 12 +++++++++--- pjlib/build/pjlib.vcxproj | 12 +++++++++---
pjlib/include/pj/config_site.h | 3 +++ pjlib/include/pj/config_site.h | 3 +++
pjmedia/build/pjmedia.vcxproj | 12 +++++++++--- pjmedia/build/pjmedia.vcxproj | 12 +++++++++---
3 files changed, 21 insertions(+), 6 deletions(-) 3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj
index f2d6fb4..dee805a 100644 index 227c3f045..b85c896bd 100644
--- a/pjlib/build/pjlib.vcxproj --- a/pjlib/build/pjlib.vcxproj
+++ b/pjlib/build/pjlib.vcxproj +++ b/pjlib/build/pjlib.vcxproj
@@ -309,14 +309,17 @@ @@ -403,14 +403,17 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
...@@ -33,7 +27,7 @@ index f2d6fb4..dee805a 100644 ...@@ -33,7 +27,7 @@ index f2d6fb4..dee805a 100644
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile>
@@ -327,10 +330,13 @@ @@ -421,10 +424,13 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
...@@ -46,8 +40,8 @@ index f2d6fb4..dee805a 100644 ...@@ -46,8 +40,8 @@ index f2d6fb4..dee805a 100644
+ <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\msvc\lib\x64;</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\msvc\lib\x64;</AdditionalLibraryDirectories>
+ </Lib> + </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile> <Midl />
diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h
index 85cf2ed..fe65725 100644 index 85cf2ed..fe65725 100644
--- a/pjlib/include/pj/config_site.h --- a/pjlib/include/pj/config_site.h
...@@ -60,16 +54,16 @@ index 85cf2ed..fe65725 100644 ...@@ -60,16 +54,16 @@ index 85cf2ed..fe65725 100644
+#define PJ_HAS_SSL_SOCK 1 +#define PJ_HAS_SSL_SOCK 1
+#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS +#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj
index e596939..0c7108b 100644 index 146bfa8de..1dac92caf 100644
--- a/pjmedia/build/pjmedia.vcxproj --- a/pjmedia/build/pjmedia.vcxproj
+++ b/pjmedia/build/pjmedia.vcxproj +++ b/pjmedia/build/pjmedia.vcxproj
@@ -307,14 +307,17 @@ @@ -397,14 +397,17 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
- <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderOutputFile /> <PrecompiledHeaderOutputFile />
</ClCompile> </ClCompile>
+ <Lib> + <Lib>
...@@ -78,26 +72,23 @@ index e596939..0c7108b 100644 ...@@ -78,26 +72,23 @@ index e596939..0c7108b 100644
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile> <ClCompile>
- <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile>
@@ -325,10 +328,13 @@ @@ -415,10 +418,13 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
- <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\msvc\include;../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderOutputFile /> <PrecompiledHeaderOutputFile />
</ClCompile> </ClCompile>
+ <Lib> + <Lib>
+ <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\msvc\lib\x64;</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\msvc\lib\x64;</AdditionalLibraryDirectories>
+ </Lib> + </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile> <Midl />
--
2.25.4
3113daca372c84beda1f9f9a1b73f02ba7d565bb1d40662cc30bf741ec0ffda4e7d69034521073ce12f80498c071166a67959531e39abb865ea8d1e48564677f pjproject-4af5d666d18837abaac94c8ec6bfc84984dcf1e2.tar.gz 4db80d37130f8b1bacb80ec6920aa3ed38d2ce551ac3770fc2cfc262e3cd9089df133d54563fbbd2ad9aa3d2cd093f9ab1829798fdd33ea4b5baf9ab28fd8156 pjproject-5e478bbf8692f43059de9c6ad654b377359baaa0.tar.gz
{ {
"name": "pjproject", "name": "pjproject",
"version": "4af5d666d18837abaac94c8ec6bfc84984dcf1e2", "version": "5e478bbf8692f43059de9c6ad654b377359baaa0",
"url": "https://github.com/savoirfairelinux/pjproject/archive/__VERSION__.tar.gz", "url": "https://github.com/savoirfairelinux/pjproject/archive/__VERSION__.tar.gz",
"deps": ["gnutls"], "deps": ["gnutls"],
"patches": [ "patches": [
......
# PJPROJECT # PJPROJECT
PJPROJECT_VERSION := 4af5d666d18837abaac94c8ec6bfc84984dcf1e2 PJPROJECT_VERSION := 5e478bbf8692f43059de9c6ad654b377359baaa0
PJPROJECT_URL := https://github.com/savoirfairelinux/pjproject/archive/${PJPROJECT_VERSION}.tar.gz PJPROJECT_URL := https://github.com/savoirfairelinux/pjproject/archive/${PJPROJECT_VERSION}.tar.gz
PJPROJECT_OPTIONS := --disable-sound \ PJPROJECT_OPTIONS := --disable-sound \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment