View Single Post
  #238  
Old 08-13-2014, 09:49 PM
aweasd aweasd is offline
Junior Member
 
Join Date: Apr 2013
Posts: 2
aweasd is on a distinguished road
Default

Re: Customized rtmpdump binaries with patch file


I'm getting 1 failed hunk when patching against 2.4 pulled from git.

Code:
[aesede@archasd ~]$ git clone git://git.ffmpeg.org/rtmpdump
Cloning into 'rtmpdump'...
remote: Counting objects: 2553, done.
remote: Compressing objects: 100% (914/914), done.
remote: Total 2553 (delta 1926), reused 2149 (delta 1638)
Receiving objects: 100% (2553/2553), 800.45 KiB | 190.00 KiB/s, done.
Resolving deltas: 100% (1926/1926), done.
Checking connectivity... done.
[aesede@archasd ~]$ cd rtmpdump
[aesede@archasd rtmpdump]$ patch -p0 -i Patch.diff
patching file Makefile
patching file librtmp/Makefile
patching file librtmp/amf.c
patching file librtmp/handshake.h
patching file librtmp/hashswf.c
patching file librtmp/log.c
patching file librtmp/parseurl.c
patching file librtmp/rtmp.c
Hunk #4 succeeded at 344 (offset 2 lines).
Hunk #5 succeeded at 368 (offset 2 lines).
Hunk #6 succeeded at 456 (offset 2 lines).
Hunk #7 succeeded at 479 (offset 2 lines).
Hunk #8 succeeded at 529 (offset 2 lines).
Hunk #9 succeeded at 588 (offset 2 lines).
Hunk #10 succeeded at 791 (offset 2 lines).
Hunk #11 succeeded at 868 (offset 2 lines).
Hunk #12 succeeded at 980 (offset 2 lines).
Hunk #13 succeeded at 1432 (offset 2 lines).
Hunk #14 succeeded at 1548 (offset 2 lines).
Hunk #15 succeeded at 1561 (offset 2 lines).
Hunk #16 succeeded at 1587 (offset 2 lines).
Hunk #17 succeeded at 1603 (offset 2 lines).
Hunk #18 succeeded at 1648 (offset 2 lines).
Hunk #19 succeeded at 1685 (offset 2 lines).
Hunk #20 succeeded at 1736 (offset 2 lines).
Hunk #21 succeeded at 1900 (offset 2 lines).
Hunk #22 succeeded at 2206 (offset 2 lines).
Hunk #23 succeeded at 2224 (offset 2 lines).
Hunk #24 succeeded at 2331 (offset 2 lines).
Hunk #25 succeeded at 2448 (offset 2 lines).
Hunk #26 succeeded at 2480 (offset 2 lines).
Hunk #27 succeeded at 2981 (offset -12 lines).
Hunk #28 succeeded at 2994 (offset -12 lines).
Hunk #29 succeeded at 3021 (offset -12 lines).
Hunk #30 succeeded at 3087 (offset -12 lines).
Hunk #31 succeeded at 3325 (offset -12 lines).
Hunk #32 succeeded at 3352 (offset -12 lines).
Hunk #33 FAILED at 3383.
Hunk #34 succeeded at 3394 (offset -23 lines).
Hunk #35 succeeded at 3463 (offset -23 lines).
Hunk #36 succeeded at 3516 (offset -23 lines).
Hunk #37 succeeded at 3620 (offset -23 lines).
Hunk #38 succeeded at 3647 (offset -23 lines).
Hunk #39 succeeded at 3682 (offset -23 lines).
Hunk #40 succeeded at 3698 (offset -23 lines).
Hunk #41 succeeded at 3780 (offset -23 lines).
Hunk #42 succeeded at 3889 (offset -23 lines).
Hunk #43 succeeded at 4202 (offset -23 lines).
Hunk #44 succeeded at 4664 (offset -23 lines).
Hunk #45 succeeded at 4684 (offset -23 lines).
Hunk #46 succeeded at 4825 (offset -23 lines).
Hunk #47 succeeded at 4847 (offset -23 lines).
Hunk #48 succeeded at 4865 (offset -23 lines).
Hunk #49 succeeded at 4909 (offset -23 lines).
Hunk #50 succeeded at 4987 (offset -23 lines).
Hunk #51 succeeded at 5396 (offset -23 lines).
Hunk #52 succeeded at 5599 (offset -23 lines).
1 out of 52 hunks FAILED -- saving rejects to file librtmp/rtmp.c.rej
patching file librtmp/rtmp.h
Hunk #2 succeeded at 177 with fuzz 2 (offset 1 line).
Hunk #3 succeeded at 228 (offset -4 lines).
Hunk #4 succeeded at 315 (offset -4 lines).
Hunk #5 succeeded at 381 (offset -4 lines).
patching file librtmp/rtmp_sys.h
patching file rtmpdump.c
patching file rtmpgw.c
patching file rtmpsrv.c
patching file rtmpsuck.c
patching file thread.c
[aesede@archasd rtmpdump]$
What version of rtmpdump was KSV's build patched against?
I downloaded the patch from: https://github.com/K-S-V/Scripts/releases
Reply With Quote