[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/files/, media-video/rtmpdump/
commit: 8bf393aded52c35ade125bc216310cd54e8f5b2a
Author: Sam James gentoo org>
AuthorDate: Thu May 12 20:42:22 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu May 12 20:42:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf393ad
media-video/rtmpdump: fix build with GCC 11
Think it's 11+ specific (obviously these things depend
heavily on env. as it's to do with transitive includes), but
only occurs with *just* USE=tools enabled.
Closes: https://bugs.gentoo.org/828082
Signed-off-by: Sam James gentoo.org>
...dump-2.4_p20210219-gcc-11-missing-include.patch | 23 ++
media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git
a/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch
b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch
new file mode 100644
index ..4325ed07381f
--- /dev/null
+++
b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/828082
+--- a/librtmp/rtmp.c
b/librtmp/rtmp.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "rtmp_sys.h"
+ #include "log.h"
+diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
+index 32b2eed..e3669e3 100644
+--- a/librtmp/hashswf.c
b/librtmp/hashswf.c
+@@ -25,6 +25,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "rtmp_sys.h"
+ #include "log.h"
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
index edd05e9dc2dd..58193c77d1ee 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
"${FILESDIR}/${PN}-fix-chunk-size.patch"
+ "${FILESDIR}/${PN}-2.4_p20210219-gcc-11-missing-include.patch"
)
if [[ ${PV} == * ]] ; then
[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/files/, media-video/rtmpdump/
commit: 8925a1e09b6a8990ff55115e43d4fa88424801c5
Author: Craig Andrews gentoo org>
AuthorDate: Mon May 9 13:26:31 2022 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon May 9 13:30:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8925a1e0
media-video/rtmpdump: Bump, EAPI=8, fix-chunk-size.patch
See:
https://git.alpinelinux.org/aports/commit/main/rtmpdump/fix-chunk-size.patch?id=bf39fb1177ee77eee6c214a7393cc0054958ce08
See:
https://git.alpinelinux.org/aports/commit/main/rtmpdump/fix-chunk-size.patch?id=69bc162319b12e9b6c6d3ea345dbf7c218753594
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Craig Andrews gentoo.org>
media-video/rtmpdump/Manifest | 1 +
.../rtmpdump/files/rtmpdump-fix-chunk-size.patch | 46 ++
...p-.ebuild => rtmpdump-2.4_p20210219.ebuild} | 9 +++--
media-video/rtmpdump/rtmpdump-.ebuild | 9 +++--
4 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 544f56a93968..bd3f5fadcdf9 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,2 +1,3 @@
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
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 ..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, , 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-.ebuild
b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
similarity index 90%
copy from media-video/rtmpdump/rtmpdump-.ebuild
copy to media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
index 77b536382925..edd05e9dc2dd 100644
--- a/media-video/rtmpdump/rtmpdump-.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.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} == * ]] ; then
@@ -34,8 +35,8 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86
~amd64-linux ~x86-linux"
-
[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/files/, media-video/rtmpdump/
commit: 385563c22fed8d4e1692f59781f7d78cc0f494ef
Author: Craig Andrews gentoo org>
AuthorDate: Wed Feb 13 04:39:41 2019 +
Commit: Craig Andrews gentoo org>
CommitDate: Wed Feb 13 04:40:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385563c2
media-video/rtmpdump: Fix OpenSSL 1.1, make libressl dep multilib
Fix issues with rtmpe streams and swf hash auto-calculation causing core dumps
See: https://github.com/xbmc/inputstream.rtmp/pull/46
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Craig Andrews gentoo.org>
media-video/rtmpdump/MBS_2018-12-07-13_16.flv | 0
media-video/rtmpdump/OBC_2018-11-02-14_04.flv | 0
.../rtmpdump/files/rtmpdump-openssl-1.1-v2.patch | 248 +
...999.ebuild => rtmpdump-2.4_p20161210-r3.ebuild} | 10 +-
media-video/rtmpdump/rtmpdump-.ebuild | 10 +-
5 files changed, 258 insertions(+), 10 deletions(-)
diff --git a/media-video/rtmpdump/MBS_2018-12-07-13_16.flv
b/media-video/rtmpdump/MBS_2018-12-07-13_16.flv
new file mode 100644
index 000..e69de29bb2d
diff --git a/media-video/rtmpdump/OBC_2018-11-02-14_04.flv
b/media-video/rtmpdump/OBC_2018-11-02-14_04.flv
new file mode 100644
index 000..e69de29bb2d
diff --git a/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
b/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
new file mode 100644
index 000..146243bd111
--- /dev/null
+++ b/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
@@ -0,0 +1,248 @@
+https://raw.githubusercontent.com/xbmc/inputstream.rtmp/master/depends/common/librtmp/0003-openssl-1.1.patch
+See also https://github.com/xbmc/inputstream.rtmp/pull/46
+--- a/librtmp/dh.h
b/librtmp/dh.h
+@@ -253,20 +253,42 @@
+ if (!dh)
+ goto failed;
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ MP_new(dh->g);
+
+ if (!dh->g)
+ goto failed;
++#else
++ BIGNUM *g = NULL;
++ MP_new(g);
++ if (!g)
++goto failed;
++#endif
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */
++#else
++ BIGNUM* p = NULL;
++ DH_get0_pqg(dh, (BIGNUM const**), NULL, NULL);
++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
++#endif
+ if (!res)
+ {
+ goto failed;
+ }
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ MP_set_w(dh->g, 2); /* base 2 */
++#else
++ MP_set_w(g, 2); /* base 2 */
++ DH_set0_pqg(dh, p, NULL, g);
++#endif
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ dh->length = nKeyBits;
++#else
++ DH_set_length(dh, nKeyBits);
++#endif
+ return dh;
+
+ failed:
+@@ -293,12 +315,24 @@
+ MP_gethex(q1, Q1024, res);
+ assert(res);
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ res = isValidPublicKey(dh->pub_key, dh->p, q1);
++#else
++ BIGNUM const* pub_key = NULL;
++ BIGNUM const* p = NULL;
++ DH_get0_key(dh, _key, NULL);
++ DH_get0_pqg(dh, , NULL, NULL);
++ res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1);
++#endif
+ if (!res)
+ {
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ MP_free(dh->pub_key);
+ MP_free(dh->priv_key);
+ dh->pub_key = dh->priv_key = 0;
++#else
++ DH_free(dh);
++#endif
+ }
+
+ MP_free(q1);
+@@ -314,15 +348,29 @@
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+ int len;
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ if (!dh || !dh->pub_key)
++#else
++ BIGNUM const* pub_key = NULL;
++ DH_get0_key(dh, _key, NULL);
++ if (!dh || !pub_key)
++#endif
+ return 0;
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ len = MP_bytes(dh->pub_key);
++#else
++ len = MP_bytes(pub_key);
++#endif
+ if (len <= 0 || len > (int) nPubkeyLen)
+ return 0;
+
+ memset(pubkey, 0, nPubkeyLen);
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++#else
++ MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
++#endif
+ return 1;
+ }
+
+@@ -364,7 +412,13 @@
+ MP_gethex(q1, Q1024, len);
+ assert(len);
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) ||
OPENSSL_VERSION_NUMBER < 0x1010L
+ if (isValidPublicKey(pubkeyBn, dh->p, q1))
++#else
++ BIGNUM const* p = NULL;
++ DH_get0_pqg(dh, , NULL, NULL);
++ if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1))
++#endif
+ res = MDH_compute_key(secret,
