Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nesterenkodm/pjsip
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: freshcode/pjsip
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 13, 2017

  1. revert podspec

    Signed-off-by: Dave Poirier <[email protected]>
    Dave Poirier committed Oct 13, 2017
    Copy the full SHA
    c7c0db3 View commit details
  2. Updated podspec

    Signed-off-by: Dave Poirier <[email protected]>
    Dave Poirier committed Oct 13, 2017
    Copy the full SHA
    219065d View commit details
  3. Updated README

    Signed-off-by: Dave Poirier <[email protected]>
    Dave Poirier committed Oct 13, 2017
    Copy the full SHA
    65c0c2b View commit details
Showing with 26 additions and 34 deletions.
  1. +6 −1 README.md
  2. +20 −33 pjsip.podspec
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

# PJSIP

WARNING: This branch is locked to the latest 2.5.5 release of PJSIP; you should only be using this if your project
is absolutely required to use this version of the library. This version has been modified to include OPUS.

We highly recommend you use the latest library from https://github.com/chebur/pjsip instead.

PJSIP is a free and open source multimedia communication library written in C language implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE.

## Features
@@ -17,7 +22,7 @@ PJSIP is a free and open source multimedia communication library written in C la
Add the following line to your `Podfile` and run `pod install` command.

```
pod 'pjsip'
pod 'pjsip', :git => 'https://github.com/freshcode/pjsip.git', :tag => '2.5.5.6'
```

## Example
53 changes: 20 additions & 33 deletions pjsip.podspec
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Pod::Spec.new do |s|
s.name = "pjsip"
s.version = "2.5.5.3"
s.version = "2.5.5.6"
s.summary = "Open Source SIP, Media and NAT Traversal Library."
s.homepage = "http://www.pjsip.org"
s.author = 'www.pjsip.org'
s.source = { :git => "https://github.com/chebur/pjsip.git", :tag => "#{s.version}" }
s.source = { :git => "https://github.com/freshcode/pjsip.git", :tag => "#{s.version}" }
s.platform = :ios, '8.0'
s.description = <<-DESC
PJSIP is a free and open source multimedia communication library written in C language implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE. It combines signaling protocol (SIP) with rich multimedia framework and NAT traversal functionality into high level API that is portable and suitable for almost any type of systems ranging from desktops, embedded systems, to mobile handsets.
@@ -25,52 +25,39 @@ LICENSE
}

s.source_files =
s.public_header_files =['build/pjproject/src/pjlib/include/*.h',
'build/pjproject/src/pjlib/include/**/*.h',
'build/pjproject/src/pjlib-util/include/**/*.h',
'build/pjproject/src/pjlib-util/include/*.h',
'build/pjproject/src/pjmedia/include/**/*.h',
'build/pjproject/src/pjmedia/include/*.h',
'build/pjproject/src/pjnath/include/**/*.h',
'build/pjproject/src/pjnath/include/*.h',
'build/pjproject/src/pjsip/include/**/*.h',
'build/pjproject/src/pjsip/include/*.h']
s.public_header_files = 'build/pjproject/src/pjlib/include/**',
'build/pjproject/src/pjlib-util/include/**',
'build/pjproject/src/pjmedia/include/**',
'build/pjproject/src/pjnath/include/**',
'build/pjproject/src/pjsip/include/**'

s.preserve_paths =['build/pjproject/src/pjlib/include/**/*',
'build/pjproject/src/pjlib/include/*',
s.preserve_paths = 'build/pjproject/src/pjlib/include/**/*',
'build/pjproject/src/pjlib-util/include/**/*',
'build/pjproject/src/pjlib-util/include/*',
'build/pjproject/src/pjmedia/include/**/*',
'build/pjproject/src/pjmedia/include/*',
'build/pjproject/src/pjnath/include/**/*',
'build/pjproject/src/pjnath/include/*',
'build/pjproject/src/pjsip/include/**/*',
'build/pjproject/src/pjsip/include/*']
'build/pjproject/src/pjsip/include/**/*'

s.vendored_libraries =['build/openh264/lib/*.a',
'build/opus/dependencies/lib/*.a',
s.vendored_libraries = 'build/opus/dependencies/lib/*.a',
'build/openh264/lib/*.a',
'build/pjproject/src/pjlib/lib/*.a',
'build/pjproject/src/pjlib-util/lib/*.a',
'build/pjproject/src/pjmedia/lib/*.a',
'build/pjproject/src/pjnath/lib/*.a',
'build/pjproject/src/pjsip/lib/*.a',
'build/pjproject/src/third_party/lib/*.a']
'build/pjproject/src/third_party/lib/*.a'

header_search_paths =['"$(PODS_ROOT)/pjsip/pjlib/include"',
'"$(PODS_ROOT)/pjsip/pjlib-util/include"',
'"$(PODS_ROOT)/pjsip/pjmedia/include"',
'"$(PODS_ROOT)/pjsip/pjnath/include"',
'"$(PODS_ROOT)/pjsip/pjsip/include"']
header_search_paths = '"$(PODS_ROOT)/pjsip/build/pjproject/src/pjlib/include"',
'"$(PODS_ROOT)/pjsip/build/pjproject/src/pjlib-util/include"',
'"$(PODS_ROOT)/pjsip/build/pjproject/src/pjmedia/include"',
'"$(PODS_ROOT)/pjsip/build/pjproject/src/pjnath/include"',
'"$(PODS_ROOT)/pjsip/build/pjproject/src/pjsip/include"'

s.xcconfig = {
'HEADER_SEARCH_PATHS' => header_search_paths.join(' '),
'GCC_PREPROCESSOR_DEFINITIONS' => 'PJ_AUTOCONF=1'
}
s.xcconfig = {'HEADER_SEARCH_PATHS' => header_search_paths.join(' '),
'GCC_PREPROCESSOR_DEFINITIONS' => 'PJ_AUTOCONF=1'}

s.dependency 'OpenSSL-Universal', '1.0.1.19'
s.frameworks = 'CFNetwork', 'AudioToolbox', 'AVFoundation', 'CoreMedia'
s.libraries = 'stdc++'
s.header_mappings_dir = 'build/pjproject/src'
s.header_mappings_dir = 'build/pjproject'
s.requires_arc = false
end