Skip to content

Fix compilation of latest main in Flatpak build and improve get_dependencies.sh script #5

New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntninja wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix compilation of latest main in Flatpak build and improve get_dependencies.sh script #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d05daf9
Allow minor version differences in PJSIP version, allow disabling `su…
ntninja Jan 22, 2026
2434ac1
Drop patches already applied in PJSIP 2.11
ntninja Jan 22, 2026
c1e9d44
Fix ALSA audio backend compilation on PJSIP 2.11
ntninja Jan 22, 2026
5e7d8c6
Fix ZRTP EmojiBase32 compilation error due to undefined `uint8_t`
ntninja Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions deps/patches/010_fix_zrtp_cstdint_include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- pjsip/third_party/zsrtp/zrtp/zrtp/EmojiBase32.cpp.orig 2026-01-22 15:52:01.376662475 +0100
+++ pjsip/third_party/zsrtp/zrtp/zrtp/EmojiBase32.cpp 2026-01-22 15:52:26.075802041 +0100
@@ -2,6 +2,7 @@
// Created by werner on 26.12.15.
//
#include <iostream>
+#include <cstdint>
// stdlib.h required for Android NDK builds, not included within the above includes
#include <cstdlib>

30 changes: 24 additions & 6 deletions deps/patches/2.11/001_pjsip_211.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3781,8 +3781,8 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia/vid_tee.c pjsip/pjmedia/src/pjmedia
if (tee->buf_pool)
pj_pool_release(tee->buf_pool);
diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c
--- pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2020-02-14 10:48:27.000000000 +0100
+++ pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2021-02-06 23:08:42.203153000 +0100
--- pjproject-2.11/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2021-03-17 08:34:46.000000000 +0100
+++ pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2026-01-22 16:58:14.647578243 +0100
@@ -43,7 +43,7 @@
#define ALSASOUND_CAPTURE 2
#define MAX_SOUND_CARDS 5
Expand Down Expand Up @@ -4015,7 +4015,16 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
SND_PCM_STREAM_PLAYBACK,
0);
if (result < 0)
@@ -722,7 +794,7 @@
@@ -677,7 +749,7 @@
if (result < 0) {
PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
"playback device '%s'", param->channel_count,
- stream->af->devs[param->play_id].name));
+ stream->af->devs[param->play_id].alsa_name));
snd_pcm_close (stream->pb_pcm);
return PJMEDIA_EAUD_SYSERR;
}
@@ -734,7 +806,7 @@

PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for playing, sample rate=%d"
", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
Expand All @@ -4024,7 +4033,7 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
rate, param->channel_count,
param->bits_per_sample, stream->pb_frames,
(int)stream->param.output_latency_ms));
@@ -746,9 +818,9 @@
@@ -758,9 +830,9 @@

/* Open PCM for capture */
PJ_LOG (5,(THIS_FILE, "open_capture: Open capture device '%s'",
Expand All @@ -4036,7 +4045,16 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
SND_PCM_STREAM_CAPTURE,
0);
if (result < 0)
@@ -842,7 +914,7 @@
@@ -809,7 +881,7 @@
if (result < 0) {
PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
"capture device '%s'", param->channel_count,
- stream->af->devs[param->rec_id].name));
+ stream->af->devs[param->rec_id].alsa_name));
snd_pcm_close (stream->ca_pcm);
return PJMEDIA_EAUD_SYSERR;
}
@@ -866,7 +938,7 @@

PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for capture, sample rate=%d"
", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
Expand All @@ -4045,7 +4063,7 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
rate, param->channel_count,
param->bits_per_sample, stream->ca_frames,
(int)stream->param.input_latency_ms));
@@ -903,6 +975,27 @@
@@ -927,6 +999,27 @@
return PJ_SUCCESS;
}

Expand Down
10 changes: 10 additions & 0 deletions deps/patches/2.11/007_fix_zrtp_cstdint_include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- pjsip/third_party/zsrtp/zrtp/zrtp/EmojiBase32.cpp.orig 2026-01-22 15:52:01.376662475 +0100
+++ pjsip/third_party/zsrtp/zrtp/zrtp/EmojiBase32.cpp 2026-01-22 15:52:26.075802041 +0100
@@ -2,6 +2,7 @@
// Created by werner on 26.12.15.
//
#include <iostream>
+#include <cstdint>
// stdlib.h required for Android NDK builds, not included within the above includes
#include <cstdlib>

Loading