commit:     9d5ba5d71aa76d4ddbe0dcaa229acd8b95eea65c
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Dec 18 14:07:20 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 13:04:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5ba5d7

net-libs/pjproject: drop 2.13-r2, 2.13.1

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-libs/pjproject/Manifest                        |   1 -
 .../pjproject/files/pjproject-2.12.1-config_site.h |  97 --------------
 ...3537-buffer-overread-on-STUN-error-decode.patch |  95 --------------
 ...2022-23547-buffer-overread-on-STUN-decode.patch |  50 -------
 net-libs/pjproject/pjproject-2.13-r2.ebuild        | 142 --------------------
 net-libs/pjproject/pjproject-2.13.1.ebuild         | 143 ---------------------
 6 files changed, 528 deletions(-)

diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 0082f1020d94..5cb1c56d78da 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,2 +1 @@
 DIST pjproject-2.13.1.tar.gz 9746437 BLAKE2B 
a50278be52df755c5cec08da0c1a604a8c0ad6911853a424596ce05bc423a829818d2e7425b55bdc00fa24a91b9a3e891c54aa2add5cdbf8698173ac44ae2975
 SHA512 
1cdfaedafa2f42b306eef38174530163db19952c6842d5c96324c7439e2437a17cd96670ac58ae04da221b06d7eb91d612f4347cd421e036be62b27cb9501cda
-DIST pjproject-2.13.tar.gz 9744716 BLAKE2B 
947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56
 SHA512 
df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520

diff --git a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h 
b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h
deleted file mode 100644
index 37d094e24bbc..000000000000
--- a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Based off of the Asterisk config_site.h file.
- *
- * In general it's the same with some removals due to being ebuild-managed.
- */
-
-#include <sys/select.h>
-
-#define GENTOO_INVALID (Gentoo compile failure - please report a bug on 
bugs.gentoo.org)
-
-/* asterisk_malloc_debug.h is not required ... most of the operations are 
no-ops regardless
- * and I can't see why asterisk is looking to compile this directly into 
pjproject */
-
-/*
- * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use 
srtp.
- * It only disables the pjmedia srtp transport which Asterisk doesn't use.
- * The reason for the disable is that while Asterisk works fine with older 
libsrtp
- * versions, newer versions of pjproject won't compile with them.
- *
- * Disabling this depends on an additional pjproject patch.  So just leave it
- * enabled for the time being, as it has always been enabled.
- */
-#define PJMEDIA_HAS_SRTP 1
-
-/* Ability to change this has ABI implications, force it on */
-/* Can be reconsidered in future:  https://bugs.gentoo.org/680496 */
-#define PJ_HAS_IPV6 1
-
-#define PJ_MAX_HOSTNAME (256)
-#define PJSIP_MAX_URL_SIZE (512)
-#ifdef PJ_HAS_LINUX_EPOLL
-#define PJ_IOQUEUE_MAX_HANDLES (5000)
-#else
-#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)
-#endif
-#define PJ_IOQUEUE_HAS_SAFE_UNREG 1
-#define PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL (16)
-
-#define PJ_SCANNER_USE_BITWISE 0
-#define PJ_OS_HAS_CHECK_STACK  0
-
-#ifndef PJ_LOG_MAX_LEVEL
-#define PJ_LOG_MAX_LEVEL               6
-#endif
-
-#define PJ_ENABLE_EXTRA_CHECK  1
-#define PJSIP_MAX_TSX_COUNT            ((64*1024)-1)
-#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1)
-#define PJSIP_UDP_SO_SNDBUF_SIZE       (512*1024)
-#define PJSIP_UDP_SO_RCVBUF_SIZE       (512*1024)
-#define PJ_DEBUG                       0
-#define PJSIP_SAFE_MODULE              0
-#define PJ_HAS_STRICMP_ALNUM           0
-
-/*
- * Do not ever enable PJ_HASH_USE_OWN_TOLOWER because the algorithm is
- * inconsistently used when calculating the hash value and doesn't
- * convert the same characters as pj_tolower()/tolower().  Thus you
- * can get different hash values if the string hashed has certain
- * characters in it.  (ASCII '@', '[', '\\', ']', '^', and '_')
- */
-#undef PJ_HASH_USE_OWN_TOLOWER
-
-/*
-  It is imperative that PJSIP_UNESCAPE_IN_PLACE remain 0 or undefined.
-  Enabling it will result in SEGFAULTS when URIs containing escape sequences 
are encountered.
-*/
-#undef PJSIP_UNESCAPE_IN_PLACE
-#define PJSIP_MAX_PKT_LEN                      65535
-
-#undef PJ_TODO
-#define PJ_TODO(x)
-
-/* Defaults too low for WebRTC */
-#define PJ_ICE_MAX_CAND 64
-#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)
-
-/* Increase limits to allow more formats */
-#define        PJMEDIA_MAX_SDP_FMT   64
-#define        PJMEDIA_MAX_SDP_BANDW   4
-#define        PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*3 + 4)
-#define        PJMEDIA_MAX_SDP_MEDIA   16
-
-/*
- * Turn off the periodic sending of CRLNCRLN.  Default is on (90 seconds),
- * which conflicts with the global section's keep_alive_interval option in
- * pjsip.conf.
- */
-#define PJSIP_TCP_KEEP_ALIVE_INTERVAL  0
-#define PJSIP_TLS_KEEP_ALIVE_INTERVAL  0
-
-#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0
-#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0
-#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1
-
-/* Required to enable things like USE=video. */
-#define PJMEDIA_HAS_VIDEO GENTOO_INVALID

diff --git 
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
 
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
deleted file mode 100644
index bfd1fc05e160..000000000000
--- 
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001
-From: Nanang Izzuddin <[email protected]>
-Date: Tue, 20 Dec 2022 11:39:12 +0700
-Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w
-
-* Fix buffer overread in STUN message decoder
-
-* Updates based on comments
----
- pjnath/include/pjnath/stun_msg.h |  4 ++++
- pjnath/src/pjnath/stun_msg.c     | 14 +++++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/pjnath/include/pjnath/stun_msg.h 
b/pjnath/include/pjnath/stun_msg.h
-index b52f95c586..e49f096f3a 100644
---- a/pjnath/include/pjnath/stun_msg.h
-+++ b/pjnath/include/pjnath/stun_msg.h
-@@ -442,6 +442,7 @@ typedef enum pj_stun_status
- 
-    \endverbatim
-  */
-+#pragma pack(1)
- typedef struct pj_stun_msg_hdr
- {
-     /**
-@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr
-     pj_uint8_t          tsx_id[12];
- 
- } pj_stun_msg_hdr;
-+#pragma pack()
- 
- 
- /**
-@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr
- 
-    \endverbatim
-  */
-+#pragma pack(1)
- typedef struct pj_stun_attr_hdr
- {
-     /**
-@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr
-     pj_uint16_t         length;
- 
- } pj_stun_attr_hdr;
-+#pragma pack()
- 
- 
- /**
-diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
-index 3def6b3eac..e904a0ba47 100644
---- a/pjnath/src/pjnath/stun_msg.c
-+++ b/pjnath/src/pjnath/stun_msg.c
-@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr)
- 
- #define INIT_ATTR(a,t,l)    (a)->hdr.type=(pj_uint16_t)(t), \
-                             (a)->hdr.length=(pj_uint16_t)(l)
--#define ATTR_HDR_LEN        4
-+#define ATTR_HDR_LEN        sizeof(pj_stun_attr_hdr)
- 
- static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos)
- {
-@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
-         status = pj_stun_msg_check(pdu, pdu_len, options);
-         if (status != PJ_SUCCESS)
-             return status;
-+    } else {
-+        /* For safety, verify packet length at least */
-+        pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20;
-+        if (msg_len > pdu_len ||
-+            ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len))
-+        {
-+            return PJNATH_EINSTUNMSGLEN;
-+        }
-     }
- 
-     /* Create the message, copy the header, and convert to host byte order */
-@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
-         p_response = NULL;
- 
-     /* Parse attributes */
--    while (pdu_len >= 4) {
-+    while (pdu_len >= ATTR_HDR_LEN) {
-         unsigned attr_type, attr_val_len;
-         const struct attr_desc *adesc;
- 
-@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
-         attr_val_len = (attr_val_len + 3) & (~3);
- 
-         /* Check length */
--        if (pdu_len < attr_val_len) {
-+        if (pdu_len < attr_val_len + ATTR_HDR_LEN) {
-             pj_str_t err_msg;
-             char err_msg_buf[80];
- 

diff --git 
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
 
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
deleted file mode 100644
index 499ce4373b56..000000000000
--- 
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001
-From: sauwming <[email protected]>
-Date: Fri, 23 Dec 2022 15:05:28 +0800
-Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr
-
-* Fixed heap buffer overflow when parsing STUN errcode attribute
-
-* Also fixed uint parsing
----
- pjnath/src/pjnath/stun_msg.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
-index c6b0bdd284..b55d29849a 100644
---- a/pjnath/src/pjnath/stun_msg.c
-+++ b/pjnath/src/pjnath/stun_msg.c
-@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool,
-     attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr);
-     GETATTRHDR(buf, &attr->hdr);
- 
--    attr->value = GETVAL32H(buf, 4);
--
-     /* Check that the attribute length is valid */
-     if (attr->hdr.length != 4)
-         return PJNATH_ESTUNINATTRLEN;
- 
-+    attr->value = GETVAL32H(buf, 4);
-+
-     /* Done */
-     *p_attr = attr;
- 
-@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool,
-     attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr);
-     GETATTRHDR(buf, &attr->hdr);
- 
-+    /* Check that the attribute length is valid */
-+    if (attr->hdr.length < 4)
-+        return PJNATH_ESTUNINATTRLEN;
-+
-     attr->err_code = buf[6] * 100 + buf[7];
- 
-     /* Get pointer to the string in the message */
-     value.ptr = ((char*)buf + ATTR_HDR_LEN + 4);
-     value.slen = attr->hdr.length - 4;
--    /* Make sure the length is never negative */
--    if (value.slen < 0)
--        value.slen = 0;
- 
-     /* Copy the string to the attribute */
-     pj_strdup(pool, &attr->reason, &value);

diff --git a/net-libs/pjproject/pjproject-2.13-r2.ebuild 
b/net-libs/pjproject/pjproject-2.13-r2.ebuild
deleted file mode 100644
index a252ce354257..000000000000
--- a/net-libs/pjproject/pjproject-2.13-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# TODO: Figure out a way to disable SRTP from pjproject entirely.
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/";
-SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-
-# g729 not included due to special bcg729 handling.
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
-SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc
-       ${CODEC_FLAGS} g729
-       ${VIDEO_FLAGS}
-       ${SOUND_FLAGS}"
-
-RDEPEND=">=net-libs/libsrtp-2.3.0:=
-       alsa? ( media-libs/alsa-lib )
-       amr? ( media-libs/opencore-amr )
-       ffmpeg? ( media-video/ffmpeg:= )
-       g729? ( media-libs/bcg729 )
-       gsm? ( media-sound/gsm )
-       ilbc? ( media-libs/libilbc )
-       openh264? ( media-libs/openh264 )
-       opus? ( media-libs/opus )
-       portaudio? ( media-libs/portaudio )
-       resample? ( media-libs/libsamplerate )
-       sdl? ( media-libs/libsdl2 )
-       speex? (
-               media-libs/speex
-               media-libs/speexdsp
-       )
-       ssl? (
-               dev-libs/openssl:0=
-       )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-       
"${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch"
-       
"${FILESDIR}/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch"
-       
"${FILESDIR}/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch"
-)
-
-src_prepare() {
-       default
-       rm configure || die "Unable to remove unwanted wrapper"
-       mv aconfigure.ac configure.ac || die "Unable to rename configure script 
source"
-       eautoreconf
-
-       cp "${FILESDIR}/pjproject-2.12.1-config_site.h" 
"${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
-}
-
-_pj_enable() {
-       usex "$1" '' "--disable-${2:-$1}"
-}
-
-_pj_get_define() {
-       local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" 
"${S}/pjlib/include/pj/config_site.h")"
-       [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h"
-       echo "$r"
-}
-
-_pj_set_define() {
-       local c=$(_pj_get_define "$1")
-       [[ "$c" = "$2" ]] && return 0
-       sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i 
"${S}/pjlib/include/pj/config_site.h" || die "sed failed updating $1 to $2."
-       [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform 
update for $1 to $2."
-}
-
-_pj_use_set_define() {
-       _pj_set_define "$2" $(usex "$1" 1 0)
-}
-
-src_configure() {
-       local myconf=()
-       local videnable="--disable-video"
-       local t
-
-       use debug || append-cflags -DNDEBUG=1
-
-       for t in ${CODEC_FLAGS}; do
-               myconf+=( $(_pj_enable ${t} ${t}-codec) )
-       done
-       myconf+=( $(_pj_enable g729 bcg729) )
-
-       for t in ${VIDEO_FLAGS}; do
-               myconf+=( $(_pj_enable ${t}) )
-               use "${t}" && videnable="--enable-video"
-       done
-
-       [ "${videnable}" = "--enable-video" ] && _pj_set_define 
PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0
-
-       LD="$(tc-getCC)" econf \
-               --enable-shared \
-               --with-external-srtp \
-               ${videnable} \
-               $(_pj_enable alsa sound) \
-               $(_pj_enable amr opencore-amr) \
-               $(_pj_enable epoll) \
-               $(_pj_enable opus) \
-               $(_pj_enable portaudio ext-sound) \
-               $(_pj_enable resample libsamplerate) \
-               $(_pj_enable resample resample-dll) \
-               $(_pj_enable resample) \
-               $(_pj_enable silk) \
-               $(_pj_enable speex speex-aec) \
-               $(_pj_enable ssl) \
-               $(_pj_enable webrtc libwebrtc) \
-               $(use_with gsm external-gsm) \
-               $(use_with portaudio external-pa) \
-               $(use_with speex external-speex) \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       emake dep LD="$(tc-getCC)"
-       emake LD="$(tc-getCC)"
-}
-
-src_install() {
-       default
-
-       newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
-       newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
-
-       if use examples; then
-               insinto "/usr/share/doc/${PF}/examples"
-               doins -r pjsip-apps/src/samples
-       fi
-
-       use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error 
removing static archives"
-}

diff --git a/net-libs/pjproject/pjproject-2.13.1.ebuild 
b/net-libs/pjproject/pjproject-2.13.1.ebuild
deleted file mode 100644
index ad7121f4bf01..000000000000
--- a/net-libs/pjproject/pjproject-2.13.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# TODO: Figure out a way to disable SRTP from pjproject entirely.
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/";
-SRC_URI="https://github.com/pjsip/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-
-# g729 not included due to special bcg729 handling.
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
-SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc
-       ${CODEC_FLAGS} g729
-       ${VIDEO_FLAGS}
-       ${SOUND_FLAGS}"
-
-RDEPEND=">=net-libs/libsrtp-2.3.0:=
-       alsa? ( media-libs/alsa-lib )
-       amr? ( media-libs/opencore-amr )
-       ffmpeg? ( media-video/ffmpeg:= )
-       g729? ( media-libs/bcg729 )
-       gsm? ( media-sound/gsm )
-       ilbc? ( media-libs/libilbc )
-       openh264? ( media-libs/openh264 )
-       opus? ( media-libs/opus )
-       portaudio? ( media-libs/portaudio )
-       resample? ( media-libs/libsamplerate )
-       sdl? ( media-libs/libsdl2 )
-       speex? (
-               media-libs/speex
-               media-libs/speexdsp
-       )
-       ssl? (
-               dev-libs/openssl:0=
-       )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-       
"${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch"
-       "${FILESDIR}/pjproject-2.13.1-fix-ptimesized-wav-input.patch"
-)
-
-src_prepare() {
-       default
-       rm configure || die "Unable to remove unwanted wrapper"
-       mv aconfigure.ac configure.ac || die "Unable to rename configure script 
source"
-       eautoreconf
-
-       cp "${FILESDIR}/pjproject-2.12.1-config_site.h" 
"${S}/pjlib/include/pj/config_site.h" \
-               || die "Unable to create config_site.h"
-}
-
-_pj_enable() {
-       usex "$1" '' "--disable-${2:-$1}"
-}
-
-_pj_get_define() {
-       local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" 
"${S}/pjlib/include/pj/config_site.h")"
-       [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h"
-       echo "$r"
-}
-
-_pj_set_define() {
-       local c=$(_pj_get_define "$1")
-       [[ "$c" = "$2" ]] && return 0
-       sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i 
"${S}/pjlib/include/pj/config_site.h" \
-               || die "sed failed updating $1 to $2."
-       [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform 
update for $1 to $2."
-}
-
-_pj_use_set_define() {
-       _pj_set_define "$2" $(usex "$1" 1 0)
-}
-
-src_configure() {
-       local myconf=()
-       local videnable="--disable-video"
-       local t
-
-       use debug || append-cflags -DNDEBUG=1
-
-       for t in ${CODEC_FLAGS}; do
-               myconf+=( $(_pj_enable ${t} ${t}-codec) )
-       done
-       myconf+=( $(_pj_enable g729 bcg729) )
-
-       for t in ${VIDEO_FLAGS}; do
-               myconf+=( $(_pj_enable ${t}) )
-               use "${t}" && videnable="--enable-video"
-       done
-
-       [ "${videnable}" = "--enable-video" ] && _pj_set_define 
PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0
-
-       LD="$(tc-getCC)" econf \
-               --enable-shared \
-               --with-external-srtp \
-               ${videnable} \
-               $(_pj_enable alsa sound) \
-               $(_pj_enable amr opencore-amr) \
-               $(_pj_enable epoll) \
-               $(_pj_enable opus) \
-               $(_pj_enable portaudio ext-sound) \
-               $(_pj_enable resample libsamplerate) \
-               $(_pj_enable resample resample-dll) \
-               $(_pj_enable resample) \
-               $(_pj_enable silk) \
-               $(_pj_enable speex speex-aec) \
-               $(_pj_enable ssl) \
-               $(_pj_enable webrtc libwebrtc) \
-               $(use_with gsm external-gsm) \
-               $(use_with portaudio external-pa) \
-               $(use_with speex external-speex) \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       emake dep LD="$(tc-getCC)"
-       emake LD="$(tc-getCC)"
-}
-
-src_install() {
-       default
-
-       newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
-       newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
-
-       if use examples; then
-               insinto "/usr/share/doc/${PF}/examples"
-               doins -r pjsip-apps/src/samples
-       fi
-
-       use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error 
removing static archives"
-}

Reply via email to