Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 542184 - [wine-overlay] >app-emulation/wine-1.7.38: gstreamer patch fails to apply when staging use flag is enabled
Summary: [wine-overlay] >app-emulation/wine-1.7.38: gstreamer patch fails to apply whe...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Adam Feldman
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-03-04 23:51 UTC by jospezial
Modified: 2015-03-23 01:50 UTC (History)
0 users

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


Attachments
patch.out (wine-1.7.28-gstreamer-v4.patch.out,17.14 KB, text/plain)
2015-03-04 23:51 UTC, jospezial
Details
patch.out (wine-1.7.38-gstreamer-v5-staging-pre.patch.out,5.53 KB, text/plain)
2015-03-21 10:55 UTC, jospezial
Details

Note You need to log in before you can comment on or make changes to this bug.
Description jospezial 2015-03-04 23:51:18 UTC
Created attachment 398094 [details]
patch.out

* Applying wine-1.6-memset-O3.patch ...
 [ ok ]
 * Applying wine-1.7.28-gstreamer-v4.patch ...

 * Failed Patch: wine-1.7.28-gstreamer-v4.patch !
 *  ( /var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.7.28-gstreamer-v4.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/app-emulation/wine-9999/temp/wine-1.7.28-gstreamer-v4.patch.out

 * ERROR: app-emulation/wine-9999::wine-overlay failed (prepare phase):
 *   Failed Patch: wine-1.7.28-gstreamer-v4.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   93:  Called src_prepare
 *   environment, line 5492:  Called autotools-utils_src_prepare
 *   environment, line 1802:  Called epatch '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.5.26-winegcc.patch' '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch' '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch' '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.6-memset-O3.patch' '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.7.28-gstreamer-v4.patch'
 *   environment, line 2579:  Called epatch '/var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.7.28-gstreamer-v4.patch'
 *   environment, line 2756:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of `emerge --info '=app-emulation/wine-9999::wine-overlay'`,
 * the complete build log and the output of `emerge -pqv '=app-emulation/wine-9999::wine-overlay'`.
 * The complete build log is located at '/var/tmp/portage/app-emulation/wine-9999/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/app-emulation/wine-9999/temp/environment'.
 * Working directory: '/var/tmp/portage/app-emulation/wine-9999/work/wine-9999'
 * S: '/var/tmp/portage/app-emulation/wine-9999/work/wine-9999

btw., I found:
http://repo.or.cz/w/wine/multimedia.git/commit/41dd203aff02350efe76ba2ca39e8bc2dac426bc
TESTING -- override pthreads to fix gstreamer v5
Comment 1 Andrew Savchenko gentoo-dev 2015-03-07 05:15:15 UTC
Please provide your emerge --info.
Comment 2 Adam Feldman gentoo-dev 2015-03-07 06:53:43 UTC
Looks like a patch from wine-staging introduced after 1.7.37 conflicts with the gstreamer plugin.  I'm working with the wine-staging dev Sebastian Lackner (slackner) to get this resolved.  Thanks for the report.
Comment 3 Adam Feldman gentoo-dev 2015-03-08 18:20:56 UTC
Thanks to slackner and tetromino for their help and fixes.
Comment 4 jospezial 2015-03-21 10:55:31 UTC
Created attachment 399366 [details]
patch.out
Comment 5 jospezial 2015-03-21 10:57:06 UTC
[ ok ]
 * Applying wine-1.7.38-gstreamer-v5-staging-pre.patch ...

 * Failed Patch: wine-1.7.38-gstreamer-v5-staging-pre.patch !
 *  ( /var/lib/layman/wine-overlay/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/app-emulation/wine-9999/temp/wine-1.7.38-gstreamer-v5-staging-pre.patch.out

 * ERROR: app-emulation/wine-9999::wine-overlay failed (prepare phase):
 *   Failed Patch: wine-1.7.38-gstreamer-v5-staging-pre.patch!
Comment 6 Adam Feldman gentoo-dev 2015-03-21 17:10:58 UTC
It actually was fixed. Another change upstream broke the patch. See https://github.com/NP-Hardass/wine-overlay/issues/5 for reference. I am aiming to get the fix finalized and up today.
Comment 7 jospezial 2015-03-22 10:51:49 UTC
(In reply to NP-Hardass from comment #6)
> It actually was fixed. Another change upstream broke the patch. See
> https://github.com/NP-Hardass/wine-overlay/issues/5 for reference. I am
> aiming to get the fix finalized and up today.

It now works again with the changes in your overlay.

I think, you should sync into the tree.

Thank you!