Skip to content

Commit 9b66d6b

Browse files
oliverepperoliverepper
committed
Merge branch 'release/0.8.2'
2 parents 69edb8e + 7de5cf8 commit 9b66d6b

14 files changed

+412
-224
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.3)
22

3-
project(phone VERSION 0.8.1 LANGUAGES C CXX)
3+
project(phone VERSION 0.9.0 LANGUAGES C CXX)
44

55
set(CMAKE_CXX_STANDARD 20)
66

‎build-darwin-dependencies.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mkdir -p build
44
pushd build || exit 1
55
sh ../scripts/get-ios-toolchain.sh
66
sh ../scripts/build-opus-darwin.sh "$(pwd)/../installed/opus"
7-
sh ../scripts/build-sdl-darwin.sh "$(pwd)/../installed/sdl"
87

98
sh ../scripts/build-pjproject-ios-arm64.sh "$(pwd)/../installed"
109

‎scripts/build-opus-darwin.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212

1313
PREFIX=$1
1414
BUILD_BASE_DIR=build-opus
15-
OPUS_COMMIT=8cf872a186b96085b1bb3a547afd598354ebeb87
15+
OPUS_COMMIT=101a71e03bbf860aaafb7090a0e440675cb27660
1616

1717
if [ -d opus ]
1818
then

‎scripts/build-pjproject-darwin-base.sh‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,21 @@ then
1111
fi
1212

1313
export PREFIX="$1/pjproject"
14-
PJPROJECT_VERSION=2.13.1
15-
16-
#IOS_ARM64_INSTALL_PREFIX="${PREFIX}/ios-arm64"
17-
#
18-
#SIMULATOR_ARM64_INSTALL_PREFIX="${PREFIX}"/simulator-arm64
19-
#
20-
##IOS_ARM64_SIMULATOR_INSTALL_PREFIX="${PREFIX}/ios-arm64-simulator"
21-
##IOS_X86_64_SIMULATOR_INSTALL_PREFIX="${PREFIX}/ios-x86_64-simulator"
22-
##IOS_ARM64_X86_64_SIMULATOR_INSTALL_PREFIX="${PREFIX}/ios-arm64_x86_64-simulator"
23-
#
24-
#
25-
#IOS_ARM64_MACCATALYST_INSTALL_PREFIX="${PREFIX}/ios-arm64-maccatalyst"
26-
#IOS_X86_64_MACCATALYST_INSTALL_PREFIX="${PREFIX}/ios-x86_64-maccatalyst"
27-
#IOS_ARM64_X86_64_MACCATALYST_INSTALL_PREFIX="${PREFIX}/ios-arm64_x86_64-maccatalyst"
28-
#
29-
#MACOS_ARM64_INSTALL_PREFIX="${PREFIX}/macos-arm64"
30-
#MACOS_X86_64_INSTALL_PREFIX="${PREFIX}/macos-x86_64"
31-
#MACOS_ARM64_X86_64_INSTALL_PREFIX="${PREFIX}/macos-arm64_x86_64"
32-
#MACOS_ARM64_DEBUG_INSTALL_PREFIX="${PREFIX}/macos-arm64-debug"
14+
PJPROJECT_URL=https://github.com/pjsip/pjproject
15+
PJPROJECT_VERSION=2.14
16+
# PJPROJECT_COMMIT=master
3317

3418
if [ -d pjproject ]
3519
then
3620
pushd pjproject
3721
git reset --hard "${PJPROJECT_VERSION}"
22+
# git pull https://github.com/pjsip/pjproject.git
23+
# git reset --hard "${PJPROJECT_COMMIT}"
3824
popd
3925
else
40-
git -c advice.detachedHead=false clone --depth 1 --branch "${PJPROJECT_VERSION}" https://github.com/pjsip/pjproject # > /dev/null 2>&1
26+
git -c advice.detachedHead=false clone --depth 1 --branch "${PJPROJECT_VERSION}" "${PJPROJECT_URL}"
27+
# git clone https://github.com/pjsip/pjproject.git
28+
# git -c advice.detachedHead=false -C pjproject checkout ${PJPROJECT_COMMIT}
4129
fi
4230

4331
# create base configuration for pjproject build
@@ -88,11 +76,11 @@ function create_lib {
8876
unset OPUS
8977
unset OPUS_LATEST
9078
fi
91-
if [[ -d "${SDL_LATEST}" ]]; then
92-
EXTRA_LIBS+=("${SDL_LATEST}/lib/libSDL2.a")
93-
unset SDL
94-
unset SDL_LATEST
95-
fi
79+
# if [[ -d "${SDL_LATEST}" ]]; then
80+
# EXTRA_LIBS+=("${SDL_LATEST}/lib/libSDL2.a")
81+
# unset SDL
82+
# unset SDL_LATEST
83+
# fi
9684

9785
LLVM=(/opt/homebrew/Cellar/llvm/*)
9886
LLVM_LATEST=${LLVM[${#LLVM[@]} - 1]}

‎scripts/build-pjproject-macos-arm64.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PREFIX="${PREFIX}/macos-arm64"
77
rm -rf "${PREFIX}"
88

99
pushd pjproject || exit 1
10-
prepare NO YES
10+
prepare NO NO
1111

1212
OPUS=("$(pwd)"/../../installed/opus/macos-arm64)
1313
OPUS_LATEST=${OPUS[${#OPUS[@]} - 1]}
@@ -16,15 +16,15 @@ then
1616
CONFIGURE_EXTRA_PARAMS+=("--with-opus=${OPUS_LATEST}")
1717
fi
1818

19-
SDL=("$(pwd)"/../../installed/sdl/macos-arm64)
20-
SDL_LATEST=${SDL[${#SDL[@]} - 1]}
21-
if [[ -d "${SDL_LATEST}" ]]; then
22-
CONFIGURE_EXTRA_PARAMS+=("--with-sdl=${SDL_LATEST}")
23-
fi
19+
# SDL=("$(pwd)"/../../installed/sdl/macos-arm64)
20+
# SDL_LATEST=${SDL[${#SDL[@]} - 1]}
21+
# if [[ -d "${SDL_LATEST}" ]]; then
22+
# CONFIGURE_EXTRA_PARAMS+=("--with-sdl=${SDL_LATEST}")
23+
# fi
2424

2525
SDKPATH=$(xcrun -sdk macosx --show-sdk-path)
2626
ARCH="arm"
27-
CFLAGS="-isysroot $SDKPATH -mmacosx-version-min=11 -DPJ_SDK_NAME=\"\\\"$(basename "$SDKPATH")\\\"\"" \
27+
CFLAGS="-g -O0 -isysroot $SDKPATH -mmacosx-version-min=11 -DPJ_SDK_NAME=\"\\\"$(basename "$SDKPATH")\\\"\"" \
2828
LDFLAGS="-isysroot $SDKPATH -framework AudioToolbox -framework Foundation -framework Network -framework Security" \
2929
./aconfigure --prefix="${PREFIX}" --host="${ARCH}"-apple-darwin "${CONFIGURE_EXTRA_PARAMS[@]}"
3030

‎scripts/build-pjproject-macos-x86_64.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PREFIX="${PREFIX}/macos-x86_64"
77
rm -rf "${PREFIX}"
88

99
pushd pjproject || exit 1
10-
prepare NO YES
10+
prepare NO NO
1111

1212
OPUS=("$(pwd)"/../../installed/opus/macos-x86_64)
1313
OPUS_LATEST=${OPUS[${#OPUS[@]} - 1]}
@@ -16,15 +16,15 @@ then
1616
CONFIGURE_EXTRA_PARAMS+=("--with-opus=${OPUS_LATEST}")
1717
fi
1818

19-
SDL=("$(pwd)"/../../installed/sdl/macos-x86_64)
20-
SDL_LATEST=${SDL[${#SDL[@]} - 1]}
21-
if [[ -d "${SDL_LATEST}" ]]; then
22-
CONFIGURE_EXTRA_PARAMS+=("--with-sdl=${SDL_LATEST}")
23-
fi
19+
# SDL=("$(pwd)"/../../installed/sdl/macos-x86_64)
20+
# SDL_LATEST=${SDL[${#SDL[@]} - 1]}
21+
# if [[ -d "${SDL_LATEST}" ]]; then
22+
# CONFIGURE_EXTRA_PARAMS+=("--with-sdl=${SDL_LATEST}")
23+
# fi
2424

2525
SDKPATH=$(xcrun -sdk macosx --show-sdk-path)
2626
ARCH="x86_64"
27-
CFLAGS="-isysroot $SDKPATH -mmacosx-version-min=11 -DPJ_SDK_NAME=\"\\\"$(basename "$SDKPATH")\\\"\" -arch ${ARCH}" \
27+
CFLAGS="-g -O0 -isysroot $SDKPATH -mmacosx-version-min=11 -DPJ_SDK_NAME=\"\\\"$(basename "$SDKPATH")\\\"\" -arch ${ARCH}" \
2828
LDFLAGS="-isysroot $SDKPATH -framework AudioToolbox -framework Foundation -framework Network -framework Security -arch ${ARCH}" \
2929
./aconfigure --prefix="${PREFIX}" --host="${ARCH}"-apple-darwin "${CONFIGURE_EXTRA_PARAMS[@]}"
3030

‎scripts/build-pjproject-x86.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash
2+
# Oliver Epper <oliver.epper@gmail.com>
3+
4+
source "$(dirname "$0")"/build-pjproject-base.sh
5+
6+
PREFIX="${PREFIX}/x86"
7+
rm -rf "${PREFIX}"
8+
9+
pushd pjproject || exit 1
10+
11+
OPUS=("$(pwd)"/../installed/opus/x86)
12+
OPUS_LATEST=${OPUS[${#OPUS[@]} - 1]}
13+
if [[ -d "${OPUS_LATEST}" ]]
14+
then
15+
CONFIGURE_EXTRA_PARAMS+=("--with-opus=${OPUS_LATEST}")
16+
fi
17+
18+
OPENSSL=("$(pwd)"/../installed/openssl/x86)
19+
OPENSSL_LATEST=${OPENSSL[${#OPENSSL[@]} - 1]}
20+
if [[ -d "${OPENSSL_LATEST}" ]]
21+
then
22+
CONFIGURE_EXTRA_PARAMS+=("--with-ssl=${OPENSSL_LATEST}")
23+
fi
24+
25+
ANDROID_NDK_ROOT="${NDK}" \
26+
TARGET_ABI=x86 \
27+
./configure-android --use-ndk-cflags --prefix="${PREFIX}" "${CONFIGURE_EXTRA_PARAMS[@]}"
28+
29+
make dep && make clean
30+
make
31+
32+
pushd pjsip-apps/src/swig || exit 1
33+
34+
make clean && make
35+
36+
echo "${PREFIX}"
37+
exit 1
38+
39+
mkdir -p "${PREFIX}"
40+
cp -R java/android/pjsua2/src/main/java "${PREFIX}"
41+
cp -R java/android/pjsua2/src/main/jniLibs "${PREFIX}"
42+
43+
popd || exit 1
44+
45+
popd || exit 1

0 commit comments

Comments
 (0)