Bug 245607 - net/pjsip: Update 2.9 -> 2.10
Summary: net/pjsip: Update 2.9 -> 2.10
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-04-13 17:59 UTC by Yuri Victorovich
Modified: 2020-04-18 10:43 UTC (History)
0 users

See Also:
madpilot: maintainer-feedback+


Attachments
patch (13.96 KB, patch)
2020-04-13 17:59 UTC, Yuri Victorovich
no flags Details | Diff
patch (13.64 KB, patch)
2020-04-13 18:00 UTC, Yuri Victorovich
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer 2020-04-13 17:59:46 UTC
Created attachment 213379 [details]
patch

Hi Guido,

The attached patch changes MASTER_SITES to GitHub because the new release 2.10 doesn't exist in MASTER_SITES.

I am also proposing to enable options VIDEO and WEBRTC by default. The reason is that these two are common use areas, and are required to support WebRTC, which is a major use case for the pjsip libary.

The patch also a typo fix.


Thank you,
Yuri
Comment 1 Yuri Victorovich freebsd_committer 2020-04-13 18:00:56 UTC
Created attachment 213380 [details]
patch
Comment 2 Guido Falsi freebsd_committer 2020-04-13 18:07:47 UTC
Hi,

Thanks for the patch and pointing out the option changes.

Actually the reason I have still not updated this is that this update breaks the asterisk ports, and the breakage shows at runtime.

The only solution I can think of is decoupling asterisk from the pjsip port by making asterisk use the embedded pjsip. At that point updating this port will not be problematic anymore, and maybe I will also be able to get rid of the extsrtp slave port.

I've been procrastinating this change, but I'll try to find time to fix this one soon.
Comment 3 Yuri Victorovich freebsd_committer 2020-04-13 19:49:21 UTC
(In reply to Guido Falsi from comment #2)

> The only solution I can think of is decoupling asterisk from the pjsip port by making asterisk use the embedded pjsip.


Alternatively, you can fork the net/pjsip port into net/pjsip-209, and link Asterisk with this fork. This trick was done with many other ports, for example devel/gradle, devel/gradle4, devel/gradl5.


Yuri
Comment 4 Guido Falsi freebsd_committer 2020-04-13 20:27:01 UTC
I could, but it's more an hack. The asterisk developers anyway strongly encourage to use the embedded pjproject, which is based on the official sources, and I also imported the asterisk patches to the pjsip port. Point is they add patches that could significantly diverge, so it's cleaner to keep asterisk on it's own bundled one.

I've been wanting to do this for some time, but I was planning to make it an option. Now I'll do that without making it an option, since the chance of it breaking is too high. This makes things simpler.

I'll need a little time to properly test all the options permutations, please allow me a few days time!
Comment 5 Yuri Victorovich freebsd_committer 2020-04-13 20:29:07 UTC
(In reply to Guido Falsi from comment #4)

No rush, please take your time!

Thank you,
Yuri
Comment 6 commit-hook freebsd_committer 2020-04-18 09:49:59 UTC
A commit references this bug:

Author: madpilot
Date: Sat Apr 18 09:49:55 UTC 2020
New revision: 532012
URL: https://svnweb.freebsd.org/changeset/ports/532012

Log:
  Make asterisk13 port use the bundled pjproject(pjsip) library, as
  suggested by upstream.

  Force the bundled pjproject to use external srtp library provided
  by ports to ensure it and asterisk itself link to the same library.

  This decouples asterisk from the pjsip port, allowing it to be
  upsdaated without breaking asterisk. [1]

  PR:		245607 [1]
  Submitted by:	yuri

Changes:
  head/net/asterisk13/Makefile
  head/net/asterisk13/distinfo
  head/net/asterisk13/files/patch-third-party_pjproject_Makefile
  head/net/asterisk13/files/patch-third-party_pjproject_Makefile.rules
  head/net/asterisk13/pkg-plist
Comment 7 commit-hook freebsd_committer 2020-04-18 09:51:00 UTC
A commit references this bug:

Author: madpilot
Date: Sat Apr 18 09:50:30 UTC 2020
New revision: 532013
URL: https://svnweb.freebsd.org/changeset/ports/532013

Log:
  Make asterisk16 port use the bundled pjproject(pjsip) library, as
  suggested by upstream.

  Force the bundled pjproject to use external srtp library provided
  by ports to ensure it and asterisk itself link to the same library.

  This decouples asterisk from the pjsip port, allowing it to be
  upsdaated without breaking asterisk. [1]

  PR:		245607 [1]
  Submitted by:	yuri

Changes:
  head/net/asterisk16/Makefile
  head/net/asterisk16/distinfo
  head/net/asterisk16/files/patch-third-party_pjproject_Makefile
  head/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules
  head/net/asterisk16/pkg-plist
Comment 8 commit-hook freebsd_committer 2020-04-18 10:41:09 UTC
A commit references this bug:

Author: madpilot
Date: Sat Apr 18 10:40:53 UTC 2020
New revision: 532019
URL: https://svnweb.freebsd.org/changeset/ports/532019

Log:
  - Update pjsip t 2.10
  - Get distfile from github
  - Add OPUS and VPX options, enabled by default
  - Make VIDEO and WEBRTC options enabled by default
  - Fix typo in WEBRTC option description
  - Fix pkgconfig patch to respect LOCALBASE

  PR:		245607
  Submitted by:	yuri

Changes:
  head/net/pjsip/Makefile
  head/net/pjsip/distinfo
  head/net/pjsip/files/patch-0030
  head/net/pjsip/files/patch-0031
  head/net/pjsip/files/patch-pkgconfig.py
  head/net/pjsip/pkg-plist
Comment 9 Guido Falsi freebsd_committer 2020-04-18 10:43:13 UTC
Committed. Thanks!