| 1 |
commit: 8925a1e09b6a8990ff55115e43d4fa88424801c5 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 9 13:26:31 2022 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 9 13:30:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8925a1e0 |
| 7 |
|
| 8 |
media-video/rtmpdump: Bump, EAPI=8, fix-chunk-size.patch |
| 9 |
|
| 10 |
See: https://git.alpinelinux.org/aports/commit/main/rtmpdump/fix-chunk-size.patch?id=bf39fb1177ee77eee6c214a7393cc0054958ce08 |
| 11 |
See: https://git.alpinelinux.org/aports/commit/main/rtmpdump/fix-chunk-size.patch?id=69bc162319b12e9b6c6d3ea345dbf7c218753594 |
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 14 |
|
| 15 |
media-video/rtmpdump/Manifest | 1 + |
| 16 |
.../rtmpdump/files/rtmpdump-fix-chunk-size.patch | 46 ++++++++++++++++++++++ |
| 17 |
...p-9999.ebuild => rtmpdump-2.4_p20210219.ebuild} | 9 +++-- |
| 18 |
media-video/rtmpdump/rtmpdump-9999.ebuild | 9 +++-- |
| 19 |
4 files changed, 57 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest |
| 22 |
index 544f56a93968..bd3f5fadcdf9 100644 |
| 23 |
--- a/media-video/rtmpdump/Manifest |
| 24 |
+++ b/media-video/rtmpdump/Manifest |
| 25 |
@@ -1,2 +1,3 @@ |
| 26 |
DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133 |
| 27 |
DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0 |
| 28 |
+DIST rtmpdump-2.4_p20210219.tar.gz 143043 BLAKE2B 312a44fa6caba3fbae19c248d76dccd22c637884ce37c207afe9de80eb0655a97af51101cd2800a2aea52620578f63e1ccede5070772126297e1c75baff0217b SHA512 2bcd169c8c142390e4a37a5f115bb722f8878188920818349aead50ad6c40b8e96c4f929f1b4d6c26ebc05ee264e6675d3843bf963ad4fbac04c3ce74b7fbb20 |
| 29 |
|
| 30 |
diff --git a/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..b714273273aa |
| 33 |
--- /dev/null |
| 34 |
+++ b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch |
| 35 |
@@ -0,0 +1,46 @@ |
| 36 |
+diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
| 37 |
+index a2863b0..ac1b3be 100644 |
| 38 |
+--- a/librtmp/rtmp.c |
| 39 |
++++ b/librtmp/rtmp.c |
| 40 |
+@@ -2077,6 +2077,29 @@ RTMP_SendClientBW(RTMP *r) |
| 41 |
+ } |
| 42 |
+ |
| 43 |
+ static int |
| 44 |
++SendClientChunkSize(RTMP *r, int chunkSize) |
| 45 |
++{ |
| 46 |
++ RTMPPacket packet; |
| 47 |
++ char pbuf[256], *pend = pbuf + sizeof(pbuf); |
| 48 |
++ int ret; |
| 49 |
++ |
| 50 |
++ packet.m_nChannel = 0x02; /* control channel (invoke) */ |
| 51 |
++ packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
| 52 |
++ packet.m_packetType = RTMP_PACKET_TYPE_CHUNK_SIZE; |
| 53 |
++ packet.m_nTimeStamp = 0; |
| 54 |
++ packet.m_nInfoField2 = 0; |
| 55 |
++ packet.m_hasAbsTimestamp = 0; |
| 56 |
++ packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; |
| 57 |
++ |
| 58 |
++ packet.m_nBodySize = 4; |
| 59 |
++ |
| 60 |
++ AMF_EncodeInt32(packet.m_body, pend, chunkSize); |
| 61 |
++ ret = RTMP_SendPacket(r, &packet, FALSE); |
| 62 |
++ r->m_outChunkSize = chunkSize; |
| 63 |
++ return ret; |
| 64 |
++} |
| 65 |
++ |
| 66 |
++static int |
| 67 |
+ SendBytesReceived(RTMP *r) |
| 68 |
+ { |
| 69 |
+ RTMPPacket packet; |
| 70 |
+@@ -3349,6 +3372,11 @@ HandleChangeChunkSize(RTMP *r, const RTMPPacket *packet) |
| 71 |
+ r->m_inChunkSize = AMF_DecodeInt32(packet->m_body); |
| 72 |
+ RTMP_Log(RTMP_LOGDEBUG, "%s, received: chunk size change to %d", __FUNCTION__, |
| 73 |
+ r->m_inChunkSize); |
| 74 |
++ if (r->Link.protocol & RTMP_FEATURE_WRITE) |
| 75 |
++ { |
| 76 |
++ RTMP_Log(RTMP_LOGDEBUG, "%s, updating outChunkSize too", __FUNCTION__); |
| 77 |
++ SendClientChunkSize(r, r->m_inChunkSize); |
| 78 |
++ } |
| 79 |
+ } |
| 80 |
+ } |
| 81 |
+ |
| 82 |
|
| 83 |
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild |
| 84 |
similarity index 90% |
| 85 |
copy from media-video/rtmpdump/rtmpdump-9999.ebuild |
| 86 |
copy to media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild |
| 87 |
index 77b536382925..edd05e9dc2dd 100644 |
| 88 |
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild |
| 89 |
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild |
| 90 |
@@ -1,7 +1,7 @@ |
| 91 |
-# Copyright 1999-2021 Gentoo Authors |
| 92 |
+# Copyright 1999-2022 Gentoo Authors |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-EAPI="7" |
| 96 |
+EAPI="8" |
| 97 |
|
| 98 |
inherit multilib toolchain-funcs multilib-minimal flag-o-matic |
| 99 |
|
| 100 |
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}" |
| 101 |
PATCHES=( |
| 102 |
"${FILESDIR}/${PN}-swf_vertification_type_2.patch" |
| 103 |
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch" |
| 104 |
+ "${FILESDIR}/${PN}-fix-chunk-size.patch" |
| 105 |
) |
| 106 |
|
| 107 |
if [[ ${PV} == *9999 ]] ; then |
| 108 |
@@ -34,8 +35,8 @@ if [[ ${PV} == *9999 ]] ; then |
| 109 |
inherit git-r3 |
| 110 |
else |
| 111 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" |
| 112 |
- SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz" |
| 113 |
- S="${WORKDIR}/${PN}-c5f04a5" |
| 114 |
+ SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz" |
| 115 |
+ S="${WORKDIR}/${PN}-f1b83c1" |
| 116 |
fi |
| 117 |
|
| 118 |
pkg_setup() { |
| 119 |
|
| 120 |
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild |
| 121 |
index 77b536382925..edd05e9dc2dd 100644 |
| 122 |
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild |
| 123 |
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild |
| 124 |
@@ -1,7 +1,7 @@ |
| 125 |
-# Copyright 1999-2021 Gentoo Authors |
| 126 |
+# Copyright 1999-2022 Gentoo Authors |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
|
| 129 |
-EAPI="7" |
| 130 |
+EAPI="8" |
| 131 |
|
| 132 |
inherit multilib toolchain-funcs multilib-minimal flag-o-matic |
| 133 |
|
| 134 |
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}" |
| 135 |
PATCHES=( |
| 136 |
"${FILESDIR}/${PN}-swf_vertification_type_2.patch" |
| 137 |
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch" |
| 138 |
+ "${FILESDIR}/${PN}-fix-chunk-size.patch" |
| 139 |
) |
| 140 |
|
| 141 |
if [[ ${PV} == *9999 ]] ; then |
| 142 |
@@ -34,8 +35,8 @@ if [[ ${PV} == *9999 ]] ; then |
| 143 |
inherit git-r3 |
| 144 |
else |
| 145 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" |
| 146 |
- SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz" |
| 147 |
- S="${WORKDIR}/${PN}-c5f04a5" |
| 148 |
+ SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz" |
| 149 |
+ S="${WORKDIR}/${PN}-f1b83c1" |
| 150 |
fi |
| 151 |
|
| 152 |
pkg_setup() { |
Archives