git: aab67e033957 - main - multimedia/ringrtc: Update to 2.40.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Fri, 03 May 2024 13:05:51 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aab67e0339574483eb1f55bad463784778e6a52c

commit aab67e0339574483eb1f55bad463784778e6a52c
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-05-03 12:55:31 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-05-03 13:05:23 +0000

    multimedia/ringrtc: Update to 2.40.0
---
 multimedia/ringrtc/Makefile        |  8 ++--
 multimedia/ringrtc/distinfo        | 14 +++----
 multimedia/ringrtc/webrtc_fetch.sh | 84 ++++++++++++++------------------------
 3 files changed, 41 insertions(+), 65 deletions(-)

diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile
index d06e98d01557..9c4bb350715a 100644
--- a/multimedia/ringrtc/Makefile
+++ b/multimedia/ringrtc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ringrtc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.39.3
+DISTVERSION=	2.40.0
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/mikael/ringrtc/:base \
 		LOCAL/mikael/ringrtc/:boringssl \
@@ -31,7 +31,7 @@ DISTFILES=	base-${BASE_REV}.tar.gz:base \
 		testing-${TESTING_REV}.tar.gz:testing \
 		opus-${OPUS_REV}.tar.gz:opus
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Middleware library for Signal-Desktop
 WWW=		https://github.com/signalapp/ringrtc
 
@@ -55,7 +55,7 @@ GH_TUPLE=	signalapp:ringrtc:${DISTVERSIONPREFIX}${DISTVERSION} \
 		signalapp:webrtc:${WEBRTC_REV}:webrtc
 
 # sh net-im/signal-desktop/get_deps.sh
-WEBRTC_REV=	6261d
+WEBRTC_REV=	6261e
 
 # modify webrtc_fetch.sh, then sh webrtc_fetch.sh
 BASE_REV=		36ecc8e397422620def3bb19a7ba392810ca2442
@@ -71,7 +71,7 @@ LIBYUV_REV=		04821d1e7d60845525e8db55c7bcd41ef5be9406
 NASM_REV=		f477acb1049f5e043904b87b825c5915084a9a29
 TESTING_REV=		450bfd79ee0369ac1a5465a12820b5d94a5956be
 THIRD_PARTY_REV=	692fab5c0074bc6fa486dce1a4aa7b2cc5609928
-OPUS_REV=		593419e833acab4d15b4901fe156177fb7315468
+OPUS_REV=		0e30966b198ad28943799eaf5b3b08100b6f70c3
 
 BINARY_ALIAS=	vpython3=${PYTHON_CMD}
 
diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo
index 43a2e2e90eb5..1f1e9de7f7c7 100644
--- a/multimedia/ringrtc/distinfo
+++ b/multimedia/ringrtc/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1713355305
+TIMESTAMP = 1714739599
 SHA256 (base-36ecc8e397422620def3bb19a7ba392810ca2442.tar.gz) = ba385d4499e3a3d13b5a76f70425da1c22a8eb3e6d58b8350380b459e06169f5
 SIZE (base-36ecc8e397422620def3bb19a7ba392810ca2442.tar.gz) = 5885707
 SHA256 (boringssl-414f69504d30d0848b69f6453ea7fb5e88004cb4.tar.gz) = 5fce22b30ae7c19649a8f1d8340010e90264ef21ed1085b30d8f41f0be3ab837
@@ -25,8 +25,8 @@ SHA256 (third_party-692fab5c0074bc6fa486dce1a4aa7b2cc5609928.tar.gz) = dba09b06a
 SIZE (third_party-692fab5c0074bc6fa486dce1a4aa7b2cc5609928.tar.gz) = 826388101
 SHA256 (testing-450bfd79ee0369ac1a5465a12820b5d94a5956be.tar.gz) = 46c66a5b429681ccad1096b9431682cfc6a40f25a2d17d0c4e7e50b3674eb3ee
 SIZE (testing-450bfd79ee0369ac1a5465a12820b5d94a5956be.tar.gz) = 2412905
-SHA256 (opus-593419e833acab4d15b4901fe156177fb7315468.tar.gz) = cf62fdbf33205e3d15e1bee829a2cb275e82fb6944826d2afb7666623470b816
-SIZE (opus-593419e833acab4d15b4901fe156177fb7315468.tar.gz) = 869636
+SHA256 (opus-0e30966b198ad28943799eaf5b3b08100b6f70c3.tar.gz) = 60867154cda4ae4f3d4ba37328b0dac1649b07462945b19c4b7c51a22aa1fae6
+SIZE (opus-0e30966b198ad28943799eaf5b3b08100b6f70c3.tar.gz) = 4205884
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -689,7 +689,7 @@ SHA256 (signalapp-libsignal-v0.37.0_GH0.tar.gz) = 7943a8ed8f6f75cae63d9de9200649
 SIZE (signalapp-libsignal-v0.37.0_GH0.tar.gz) = 1067773
 SHA256 (signalapp-curve25519-dalek-signal-curve25519-4.1.1_GH0.tar.gz) = f129765413794896efd19667acda3645b9cd17b01181700fd781df68b584ec3d
 SIZE (signalapp-curve25519-dalek-signal-curve25519-4.1.1_GH0.tar.gz) = 801981
-SHA256 (signalapp-ringrtc-v2.39.3_GH0.tar.gz) = bd9c7a0325e4198e823a05f79bc681c73bb813ad78377fb342e959c776eea7ee
-SIZE (signalapp-ringrtc-v2.39.3_GH0.tar.gz) = 811359
-SHA256 (signalapp-webrtc-6261d_GH0.tar.gz) = bdd63f731f9e9e6bbe31cc109cc0c74918410f2cb886878e2e5c4904d6f1f5d1
-SIZE (signalapp-webrtc-6261d_GH0.tar.gz) = 39777153
+SHA256 (signalapp-ringrtc-v2.40.0_GH0.tar.gz) = 95ad69b6acf74b2709a8d901de3e2bdf867f886afdea0aa10f305eab26249b53
+SIZE (signalapp-ringrtc-v2.40.0_GH0.tar.gz) = 813891
+SHA256 (signalapp-webrtc-6261e_GH0.tar.gz) = fdaaf84efb6f2b55b69039918e839375ddbf6d1ee2820cdd3e3ad8b8a0173385
+SIZE (signalapp-webrtc-6261e_GH0.tar.gz) = 39775612
diff --git a/multimedia/ringrtc/webrtc_fetch.sh b/multimedia/ringrtc/webrtc_fetch.sh
index c8e59d32d1d4..566551e3d14f 100644
--- a/multimedia/ringrtc/webrtc_fetch.sh
+++ b/multimedia/ringrtc/webrtc_fetch.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-WEBRTC_REV=6261d
-OPUS_BRANCH=6261
-# XXX also change fetch opus
+WEBRTC_REV=6261e
 
 base_url="https://chromium.googlesource.com/chromium/src/base.git/+archive/"
 boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/"
@@ -76,54 +74,32 @@ third_party_hash=$(grep 'third_party@' /tmp/DEPS | awk -F '@' '{print $2}' | sed
 printf "THIRD_PARTY_REV=\t${third_party_hash}\n"
 printf "THIRD_PARTY_REV=\t${third_party_hash}\n" | portedit merge -i Makefile
 
-mkdir dist_tmp
-echo "fetch -o dist_tmp/base-${base_hash}.tar.gz ${base_url}${base_hash}.tar.gz"
-echo "fetch -o dist_tmp/boringssl-${boringssl_hash}.tar.gz ${boringssl_url}${boringssl_hash}.tar.gz"
-echo "fetch -o dist_tmp/build-${build_hash}.tar.gz ${build_url}${build_hash}.tar.gz"
-echo "fetch -o dist_tmp/buildtools-${buildtools_hash}.tar.gz ${buildtools_url}${buildtools_hash}.tar.gz"
-echo "fetch -o dist_tmp/catapult-${catapult_hash}.tar.gz ${catapult_url}${catapult_hash}.tar.gz"
-echo "fetch -o dist_tmp/icu-${icu_hash}.tar.gz ${icu_url}${icu_hash}.tar.gz"
-echo "fetch -o dist_tmp/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz ${libjpeg_turbo_url}${libjpeg_turbo_hash}.tar.gz"
-echo "fetch -o dist_tmp/libsrtp-${libsrtp_hash}.tar.gz ${libsrtp_url}${libsrtp_hash}.tar.gz"
-echo "fetch -o dist_tmp/libvpx-${libvpx_hash}.tar.gz ${libvpx_url}${libvpx_hash}.tar.gz"
-echo "fetch -o dist_tmp/libyuv-${libyuv_hash}.tar.gz ${libyuv_url}${libyuv_hash}.tar.gz"
-echo "fetch -o dist_tmp/nasm-${nasm_hash}.tar.gz ${nasm_url}${nasm_hash}.tar.gz"
-echo "fetch -o dist_tmp/opus-${opus_hash}.tar.gz https://codeload.github.com/signalapp/opus/tar.gz/webrtc-${OPUS_BRANCH}?dummy=/"
-echo "fetch -o dist_tmp/testing-${testing_hash}.tar.gz ${testing_url}${testing_hash}.tar.gz"
-echo "fetch -o dist_tmp/third_party-${third_party_hash}.tar.gz ${third_party_url}${third_party_hash}.tar.gz"
-
-exit
-
-mkdir -p base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm opus testing third_party
-tar xf dist_tmp/base-${base_hash}.tar.gz -C base
-tar xf dist_tmp/boringssl-${boringssl_hash}.tar.gz -C boringssl
-tar xf dist_tmp/build-${build_hash}.tar.gz -C build
-tar xf dist_tmp/buildtools-${buildtools_hash}.tar.gz -C buildtools
-tar xf dist_tmp/catapult-${catapult_hash}.tar.gz -C catapult
-tar xf dist_tmp/icu-${icu_hash}.tar.gz -C icu
-tar xf dist_tmp/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz -C libjpeg_turbo
-tar xf dist_tmp/libsrtp-${libsrtp_hash}.tar.gz -C libsrtp
-tar xf dist_tmp/libvpx-${libvpx_hash}.tar.gz -C libvpx
-tar xf dist_tmp/libyuv-${libyuv_hash}.tar.gz -C libyuv
-tar xf dist_tmp/nasm-${nasm_hash}.tar.gz -C nasm
-tar xf dist_tmp/opus-${opus_hash}.tar.gz -C opus --strip-components 1
-tar xf dist_tmp/testing-${testing_hash}.tar.gz -C testing
-tar xf dist_tmp/third_party-${third_party_hash}.tar.gz -C third_party
-
-mkdir dist_good
-tar czf dist_good/base-${base_hash}.tar.gz base
-tar czf dist_good/boringssl-${boringssl_hash}.tar.gz boringssl
-tar czf dist_good/build-${build_hash}.tar.gz build
-tar czf dist_good/buildtools-${buildtools_hash}.tar.gz buildtools
-tar czf dist_good/catapult-${catapult_hash}.tar.gz catapult
-tar czf dist_good/icu-${icu_hash}.tar.gz icu
-tar czf dist_good/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz libjpeg_turbo
-tar czf dist_good/libsrtp-${libsrtp_hash}.tar.gz libsrtp
-tar czf dist_good/libvpx-${libvpx_hash}.tar.gz libvpx
-tar czf dist_good/libyuv-${libyuv_hash}.tar.gz libyuv
-tar czf dist_good/nasm-${nasm_hash}.tar.gz nasm
-tar czf dist_good/opus-${opus_hash}.tar.gz opus
-tar czf dist_good/testing-${testing_hash}.tar.gz testing
-tar czf dist_good/third_party-${third_party_hash}.tar.gz third_party
-
-rm -rf base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm opus testing third_party
+mkdir -p dist_good
+
+for c in base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm testing third_party
+do
+	hash=$(echo ${c}_hash)
+	eval "hash=\$$hash"
+
+	if [ ! -f /usr/ports/distfiles/${c}-${hash}.tar.gz ] && [ ! -f dist_good/${c}-${hash}.tar.gz ]; then
+		url=$(echo ${c}_url)
+		eval "url=\$$url"
+
+		echo "Fetching ${url}${hash}.tar.gz"
+
+		mkdir -p ${c}
+		fetch -qo - ${url}${hash}.tar.gz | tar xf - -C ${c}
+		tar czf dist_good/${c}-${hash}.tar.gz ${c}
+		rm -rf ${c}
+	fi
+done
+
+if [ ! -f /usr/ports/distfiles/opus-${opus_hash}.tar.gz ] && [ ! -f dist_good/opus-${opus_hash}.tar.gz ]; then
+	echo "Fetching Opus"
+	mkdir -p opus
+	fetch -qo - https://codeload.github.com/xiph/opus/tar.gz/${opus_hash}?dummy=/ | tar xf - -C opus --strip-components 1
+	tar czf dist_good/opus-${opus_hash}.tar.gz opus
+	rm -rf dist_tmp/opus-${opus_hash}.tar.gz opus
+fi
+
+echo "Copy dist_good/* in /usr/ports/distfiles and run make makesum"