gentoo resync : 12.05.2022

4 files changed, 147 insertions, 5 deletions

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 37432671cc26..65cf629b90ec 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,9 +1,12 @@
+AUX rtmpdump-fix-chunk-size.patch 1332 BLAKE2B 2044907f1e34c35229d8c1f97e4f9e51fac9d0d45ef9a3b426db556d697d524ffa625d13d299007b8ea3b99034bce5c880bebbc88c43baaafd93c203a24c9c93 SHA512 f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d
 AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08230c7e9221be711983c6e525b7b550fd7062182796049f03f35a908eb12947e333b90c25085dce37ac6e7a0a51cff5a SHA512 f3b39e5c52db0e14d686ab02c7e374fae1c47304bee19a66b1e93eb24ad67c2f08af3695b9919ceccfdbf78f5533ce95f9877725aa3e6cc3f9d660c116e83050
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
 DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
+DIST rtmpdump-2.4_p20210219.tar.gz 143043 BLAKE2B 312a44fa6caba3fbae19c248d76dccd22c637884ce37c207afe9de80eb0655a97af51101cd2800a2aea52620578f63e1ccede5070772126297e1c75baff0217b SHA512 2bcd169c8c142390e4a37a5f115bb722f8878188920818349aead50ad6c40b8e96c4f929f1b4d6c26ebc05ee264e6675d3843bf963ad4fbac04c3ce74b7fbb20
 EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2696 BLAKE2B ac811b42e9812140688c9b5a33a2255b4457e095de83b096eaae4f9959d0de8a50e919d1e6fb7385e7d256af25ab23c8bd980da70532bc67d8c730e2da4d6af5 SHA512 653d227609c0c1a38a85ce9ceb0eeaca3b6628ba79af5e877d1a2a76e58d2296222ba584da04a55abb784a05c2a8dfdc9d27a95ab07fb16317f36c1c22b73edc
 EBUILD rtmpdump-2.4_p20190330.ebuild 2633 BLAKE2B 2e115cd1d1710de282de394fef7aac3b10a002606f2da149317f21e685b6e47cffff4b720d5bd303d2f0e6f91f555499f5ae66767d832a9a4b9e67c163224012 SHA512 18ecef8e51588fb946e12de48c9033908bf1988b4681129851f27c176e8b4cfb77fc229c4f0772837f54ed52b11443b1a158e8ed04e3b1673753dc250dcf902f
-EBUILD rtmpdump-9999.ebuild 2633 BLAKE2B 2e115cd1d1710de282de394fef7aac3b10a002606f2da149317f21e685b6e47cffff4b720d5bd303d2f0e6f91f555499f5ae66767d832a9a4b9e67c163224012 SHA512 18ecef8e51588fb946e12de48c9033908bf1988b4681129851f27c176e8b4cfb77fc229c4f0772837f54ed52b11443b1a158e8ed04e3b1673753dc250dcf902f
+EBUILD rtmpdump-2.4_p20210219.ebuild 2676 BLAKE2B 515f1f8e5c83018505a2c15624eb5185ff98d15e59c017acbe47c7e63fd08b6f4e5063a38ce9e60108d3826799be4de3e524c400025e1af94530f9bf511af201 SHA512 4c90599c84248c3e0c4158bb0d9b39ce953269f21ebbac0321f746f546d24d268f611fdeba35c905d38ea7c6b0e2648d76a827e4032432925b801bfc018473d4
+EBUILD rtmpdump-9999.ebuild 2676 BLAKE2B 515f1f8e5c83018505a2c15624eb5185ff98d15e59c017acbe47c7e63fd08b6f4e5063a38ce9e60108d3826799be4de3e524c400025e1af94530f9bf511af201 SHA512 4c90599c84248c3e0c4158bb0d9b39ce953269f21ebbac0321f746f546d24d268f611fdeba35c905d38ea7c6b0e2648d76a827e4032432925b801bfc018473d4
 MISC metadata.xml 746 BLAKE2B 30f330e57b0467571f5536b4689c3a52ed5e36ad759855b90e26226673ebb9b3388ad4b257d8c2c01069aeeb337531e27031828be23e0e56aa0d8076c7ae9abd SHA512 7eb134cf59798c33074457c2238de22a69d7d29469d4d4705c990a29a660837b3df5794af19ac5176056c8010e7d040e0aefa8cbfcdeb1df5d316c2d921cc6ac
diff --git a/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch
new file mode 100644
index 000000000000..b714273273aa
--- /dev/null
+++ b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch
@@ -0,0 +1,46 @@
+diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
+index a2863b0..ac1b3be 100644
+--- a/librtmp/rtmp.c
++++ b/librtmp/rtmp.c
+@@ -2077,6 +2077,29 @@ RTMP_SendClientBW(RTMP *r)
+ }
+ 
+ static int
++SendClientChunkSize(RTMP *r, int chunkSize)
++{
++  RTMPPacket packet;
++  char pbuf[256], *pend = pbuf + sizeof(pbuf);
++  int ret;
++
++  packet.m_nChannel = 0x02;	/* control channel (invoke) */
++  packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
++  packet.m_packetType = RTMP_PACKET_TYPE_CHUNK_SIZE;
++  packet.m_nTimeStamp = 0;
++  packet.m_nInfoField2 = 0;
++  packet.m_hasAbsTimestamp = 0;
++  packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
++
++  packet.m_nBodySize = 4;
++
++  AMF_EncodeInt32(packet.m_body, pend, chunkSize);
++  ret = RTMP_SendPacket(r, &packet, FALSE);
++  r->m_outChunkSize = chunkSize;
++  return ret;
++}
++
++static int
+ SendBytesReceived(RTMP *r)
+ {
+   RTMPPacket packet;
+@@ -3349,6 +3372,11 @@ HandleChangeChunkSize(RTMP *r, const RTMPPacket *packet)
+       r->m_inChunkSize = AMF_DecodeInt32(packet->m_body);
+       RTMP_Log(RTMP_LOGDEBUG, "%s, received: chunk size change to %d", __FUNCTION__,
+ 	  r->m_inChunkSize);
++      if (r->Link.protocol & RTMP_FEATURE_WRITE)
++        {
++          RTMP_Log(RTMP_LOGDEBUG, "%s, updating outChunkSize too", __FUNCTION__);
++          SendClientChunkSize(r, r->m_inChunkSize);
++        }
+     }
+ }
+ 
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
new file mode 100644
index 000000000000..edd05e9dc2dd
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
+SLOT="0"
+IUSE="gnutls ssl static-libs +tools"
+
+DEPEND="ssl? (
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
+	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
+	"${FILESDIR}/${PN}-fix-chunk-size.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-f1b83c1"
+fi
+
+pkg_setup() {
+	if ! use ssl; then
+		if use gnutls; then
+			ewarn "USE='gnutls' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+	fi
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+		|| die "failed to fix Makefile"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ; then
+			crypto="GNUTLS"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	if ! multilib_is_native_abi || ! use tools ; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi && use tools ; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+		CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
+	find "${D}" -name '*.la' -delete || die
+	use static-libs || find "${D}" -name '*.a' -delete || die
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 77b536382925..edd05e9dc2dd 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
 	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
+	"${FILESDIR}/${PN}-fix-chunk-size.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
@@ -34,8 +35,8 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-c5f04a5"
+	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-f1b83c1"
 fi
 
 pkg_setup() {