Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Update to pjsip version 1.14.2 #63

Closed
wants to merge 3 commits into
from
View
@@ -13,7 +13,7 @@ near Telephone, in the same parent directory.
[pjsip]: http://www.pjsip.org/
- $ svn checkout http://svn.pjsip.org/repos/pjproject/tags/1.12 pjproject
+ $ svn checkout http://svn.pjsip.org/repos/pjproject/branches/1.x pjproject
$ cd pjproject
Create the file `pjlib/include/pj/config_site.h` with the following
View
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.4</string>
+ <string>1.0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>104</string>
+ <string>105</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSHasLocalizedDisplayName</key>
@@ -679,7 +679,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0440;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Telephone" */;
compatibilityVersion = "Xcode 3.2";
@@ -1071,6 +1071,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
@@ -1090,6 +1091,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
@@ -1109,6 +1111,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
@@ -1133,6 +1136,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
@@ -1156,13 +1160,15 @@
AAF99B2E14A2577D00D087DC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
AAF99B2F14A2577D00D087DC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@@ -1171,7 +1177,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+<<<<<<< HEAD
+ COMBINE_HIDPI_IMAGES = YES;
+=======
CLANG_ENABLE_OBJC_ARC = YES;
+>>>>>>> FETCH_HEAD
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1204,6 +1214,25 @@
"-DNDEBUG",
);
OTHER_LDFLAGS = (
+<<<<<<< HEAD
+ "-lpjsua-i386-apple-darwin12.4.0",
+ "-lpjsip-ua-i386-apple-darwin12.4.0",
+ "-lpjsip-simple-i386-apple-darwin12.4.0",
+ "-lpjsip-i386-apple-darwin12.4.0",
+ "-lpjmedia-codec-i386-apple-darwin12.4.0",
+ "-lpjmedia-i386-apple-darwin12.4.0",
+ "-lpjmedia-audiodev-i386-apple-darwin12.4.0",
+ "-lpjnath-i386-apple-darwin12.4.0",
+ "-lpjlib-util-i386-apple-darwin12.4.0",
+ "-lresample-i386-apple-darwin12.4.0",
+ "-lmilenage-i386-apple-darwin12.4.0",
+ "-lsrtp-i386-apple-darwin12.4.0",
+ "-lgsmcodec-i386-apple-darwin12.4.0",
+ "-lspeex-i386-apple-darwin12.4.0",
+ "-lilbccodec-i386-apple-darwin12.4.0",
+ "-lportaudio-i386-apple-darwin12.4.0",
+ "-lpj-i386-apple-darwin12.4.0",
+=======
"-lpjsua-i386-apple-darwin12.2.0",
"-lpjsip-ua-i386-apple-darwin12.2.0",
"-lpjsip-simple-i386-apple-darwin12.2.0",
@@ -1221,6 +1250,7 @@
"-lilbccodec-i386-apple-darwin12.2.0",
"-lportaudio-i386-apple-darwin12.2.0",
"-lpj-i386-apple-darwin12.2.0",
+>>>>>>> FETCH_HEAD
);
PRODUCT_NAME = Telephone;
};
@@ -1230,7 +1260,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+<<<<<<< HEAD
+ COMBINE_HIDPI_IMAGES = YES;
+=======
CLANG_ENABLE_OBJC_ARC = YES;
+>>>>>>> FETCH_HEAD
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1261,6 +1295,25 @@
"-DNDEBUG",
);
OTHER_LDFLAGS = (
+<<<<<<< HEAD
+ "-lpjsua-i386-apple-darwin12.4.0",
+ "-lpjsip-ua-i386-apple-darwin12.4.0",
+ "-lpjsip-simple-i386-apple-darwin12.4.0",
+ "-lpjsip-i386-apple-darwin12.4.0",
+ "-lpjmedia-codec-i386-apple-darwin12.4.0",
+ "-lpjmedia-i386-apple-darwin12.4.0",
+ "-lpjmedia-audiodev-i386-apple-darwin12.4.0",
+ "-lpjnath-i386-apple-darwin12.4.0",
+ "-lpjlib-util-i386-apple-darwin12.4.0",
+ "-lresample-i386-apple-darwin12.4.0",
+ "-lmilenage-i386-apple-darwin12.4.0",
+ "-lsrtp-i386-apple-darwin12.4.0",
+ "-lgsmcodec-i386-apple-darwin12.4.0",
+ "-lspeex-i386-apple-darwin12.4.0",
+ "-lilbccodec-i386-apple-darwin12.4.0",
+ "-lportaudio-i386-apple-darwin12.4.0",
+ "-lpj-i386-apple-darwin12.4.0",
+=======
"-lpjsua-i386-apple-darwin12.2.0",
"-lpjsip-ua-i386-apple-darwin12.2.0",
"-lpjsip-simple-i386-apple-darwin12.2.0",
@@ -1278,6 +1331,7 @@
"-lilbccodec-i386-apple-darwin12.2.0",
"-lportaudio-i386-apple-darwin12.2.0",
"-lpj-i386-apple-darwin12.2.0",
+>>>>>>> FETCH_HEAD
);
PRODUCT_NAME = Telephone;
};