Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 901995 - media-video/vlc-9999 vlc-2.2.8-freerdp-2.patch fails to apply (@ 4d5606c58)
Summary: media-video/vlc-9999 vlc-2.2.8-freerdp-2.patch fails to apply (@ 4d5606c58)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Media-video project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-03-18 05:45 UTC by Duncan
Modified: 2023-05-27 02:47 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Duncan 2023-03-18 05:45:44 UTC
At upstream 4d5606c58 ...

* Applying vlc-2.2.8-freerdp-2.patch ...
patching file configure.ac
Hunk #1 FAILED at 1957.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
patching file modules/access/rdp.c
Hunk #1 FAILED at 45.
Hunk #2 succeeded at 198 with fuzz 2 (offset 58 lines).
Hunk #3 FAILED at 150.
Hunk #4 FAILED at 173.
Hunk #5 FAILED at 234.
Hunk #6 FAILED at 429.
Hunk #7 FAILED at 507.
6 out of 7 hunks FAILED -- saving rejects to file modules/access/rdp.c.rej                                                                                     [ !! ]

Troubleshooting a 3.0.18 problem I decided to try -9999, only to run into this.  Maybe I'll get a bisect later this weekend, getting sleepy and may not get it tonight, but failed patches should maintainer-replicate in any case.
Comment 1 Duncan 2023-03-18 06:04:53 UTC
A git log search on modules/access/rdp.c turns up latest hits 293904e4e and 95e7bba61, from July (2022), with 95e... saying it updates to freerdp2 api, so perhaps we don't need the patch at all now?  (FWIW I'm USE=-rdp so wouldn't test that functionality anyway.)
Comment 2 Duncan 2023-03-18 06:25:18 UTC
So commented the rdp patch and now vlc-configure_lua_version.patch fails:

* Applying vlc-configure_lua_version.patch ...
patching file configure.ac
Hunk #1 FAILED at 1907.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej                                                                                              [ !! ]
Comment 3 Viktor 2023-05-26 18:10:43 UTC
I can confirm it, here is my log: http://pastebin.calculate-linux.org/en/show/269691

Any solution?
Comment 4 Duncan 2023-05-27 01:07:19 UTC
(In reply to Viktor from comment #3)
> Any solution?

As suggested in earlier comments, the freerdp-2 patch should no longer be necessary -- upstream has updated to the 2 API already, superseding the gentoo patch.  So just comment it out.

But then the lua patch didn't apply (comment #2), and I don't believe I traced that one down as the problem I was trying to use -9999 to troubleshoot turned out not to be a vlc problem at all.  So I don't know if the lua patch attempt is still made, or if just commenting it out will work as it does with the freerdp2 patch, or not.  So you'll likely still need to deal with that.

(Meanwhile, the problem that I had with vlc turned out to be a kwin window rules issue. The rule used to set transparency and I was overriding my general semi-transparent rule with a 0% transparency rule for the vlc video window.  The kwin folks reversed the rule logic to deal with opacity instead of transparency, so the existing rule switched from applying 0% transparency to 0% opacity -- invisible windows!!  (They could still be clicked of course, popping up visible menus, etc, if you could guess where to click.)  So different vlc versions of course wouldn't help, unless by some chance they messed up whatever windowclass-match/title-partial-match/etc filter I was using so it didn't apply any longer.  But once I figured out the problem it was of course an easy enough fix, just change the window rule to 100% opacity; nothing at all to do with vlc except that its video window happened to be the one I was applying the rule to.)
Comment 5 Larry the Git Cow gentoo-dev 2023-05-27 02:17:05 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e269d743a4ffd1a74e8efeeb2b088bfb2da47b72

commit e269d743a4ffd1a74e8efeeb2b088bfb2da47b72
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2023-05-27 02:16:24 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2023-05-27 02:16:51 +0000

    media-video/vlc: rebase live patches
    
    Closes: https://bugs.gentoo.org/901995
    Signed-off-by: Sam James <sam@gentoo.org>

 ....patch => vlc-9999-configure-lua-version.patch} | 24 +++++++++++++---------
 .../vlc/files/vlc-9999-fix-libtremor-libs.patch    | 20 ++++++++++++++++++
 media-video/vlc/vlc-9999.ebuild                    |  5 ++---
 3 files changed, 36 insertions(+), 13 deletions(-)
Comment 6 Larry the Git Cow gentoo-dev 2023-05-27 02:47:36 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d26c40982765c7a36e7da8c21dec5e3a8b43ef

commit 59d26c40982765c7a36e7da8c21dec5e3a8b43ef
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2023-05-27 02:47:15 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2023-05-27 02:47:19 +0000

    media-video/vlc: scrub patches
    
    Accidentally left in dummy commit msg, oops.
    
    Bug: https://bugs.gentoo.org/901995
    Signed-off-by: Sam James <sam@gentoo.org>

 media-video/vlc/files/vlc-9999-configure-lua-version.patch | 9 ---------
 media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch    | 9 ---------
 2 files changed, 18 deletions(-)