From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1519431-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 415E315806E for <garchives@archives.gentoo.org>; Thu, 18 May 2023 05:00:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 795F5E07E6; Thu, 18 May 2023 05:00:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52352E07E6 for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2023 05:00:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16F23340C43 for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2023 05:00:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75650990 for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2023 05:00:49 +0000 (UTC) From: "John Helmert III" <ajak@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" <ajak@gentoo.org> Message-ID: <1684385799.8686b210bccaafa6e98ee6a4e4578d82bb47ff97.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/pjproject/Manifest net-libs/pjproject/pjproject-2.12.1-r2.ebuild net-libs/pjproject/pjproject-2.13.ebuild X-VCS-Directories: net-libs/pjproject/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 8686b210bccaafa6e98ee6a4e4578d82bb47ff97 X-VCS-Branch: master Date: Thu, 18 May 2023 05:00:49 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d18cd6f-68fd-4096-bf3d-dc208e3d9b14 X-Archives-Hash: b3f40946228278e6a46bd0fc3de049a4 commit: 8686b210bccaafa6e98ee6a4e4578d82bb47ff97 Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Tue May 16 10:27:52 2023 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Thu May 18 04:56:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8686b210 net-libs/pjproject: drop 2.12.1-r2, 2.13 Bug: https://bugs.gentoo.org/887559 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Signed-off-by: John Helmert III <ajak <AT> gentoo.org> net-libs/pjproject/Manifest | 1 - net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 144 -------------------------- net-libs/pjproject/pjproject-2.13.ebuild | 139 ------------------------- 3 files changed, 284 deletions(-) diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index 10063228d714..c081c0e1aeb2 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,2 +1 @@ -DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa SHA512 9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b DIST pjproject-2.13.tar.gz 9744716 BLAKE2B 947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56 SHA512 df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520 diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild deleted file mode 100644 index 5d6d6c7a9b1f..000000000000 --- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 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://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/libsdl ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) - ssl? ( - <dev-libs/openssl-3.0.0:0= - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/pjproject-2.12.1-CVE-2022-31031.patch" - "${FILESDIR}/pjproject-2.12.1-r2-CVE-2022-39244.patch" # 875863 - "${FILESDIR}/pjproject-2.12.1-r2-CVE-2022-39269.patch" # 875863 - "${FILESDIR}/pjproject-2.12.1-r2-bashism.patch" # 865719 - "${FILESDIR}/pjproject-2.12.1-r2-musl.patch" # 867343 -) - -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.ebuild b/net-libs/pjproject/pjproject-2.13.ebuild deleted file mode 100644 index 67e6269fd001..000000000000 --- a/net-libs/pjproject/pjproject-2.13.ebuild +++ /dev/null @@ -1,139 +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/libsdl ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( -) - -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" -}