Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 265770 - [PATCH] media-video/smplayer: fix eqmake4 usage
Summary: [PATCH] media-video/smplayer: fix eqmake4 usage
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo Media-video project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 244692
  Show dependency tree
 
Reported: 2009-04-11 14:53 UTC by Davide Pesavento
Modified: 2009-05-09 23:52 UTC (History)
1 user (show)

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


Attachments
diff against 0.6.7_p2872-r1 (smplayer.ebuild.patch,3.19 KB, patch)
2009-04-11 14:55 UTC, Davide Pesavento (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Davide Pesavento (RETIRED) gentoo-dev 2009-04-11 14:53:39 UTC
Currently the call to eqmake4 in src_configure() is totally useless because the top-level Makefile will later re-run qmake, thus destroying eqmake4's effects. Upstream's Makefile sucks a lot, so the solution is to rewrite most of its default rule in a way that it recursively invokes itself on the subdir 'src' and do nothing else.

While at it, I changed the generation of svn_revision.h to actually report the correct SVN rev when the ebuild is a snapshot (the revision number is extracted from ${PV}). Furthermore the code should now be able to handle both regular releases (i.e. -x.y.z without _pXXXX components) and unofficial svn snapshots (e.g. -0.6.7_p2872), without having to change ${S}, ${SRC_URI}, etc...

Finally, I fixed a small bug. Look at the following snippet:
    [[ -f *.qm ]] || lrelease ${PN}_en_US.ts
Filename expansion is not performed inside [[ ]] -> *.qm remains as it is -> bash tries to literally match it -> the test is always false because there's no file named "*.qm" -> the en_US translation is always generated.
Comment 1 Davide Pesavento (RETIRED) gentoo-dev 2009-04-11 14:55:01 UTC
Created attachment 187987 [details, diff]
diff against 0.6.7_p2872-r1
Comment 2 Davide Pesavento (RETIRED) gentoo-dev 2009-04-14 19:57:58 UTC
CC'ing yngwin since he is smplayer's maintainer.
Comment 3 Ben de Groot (RETIRED) gentoo-dev 2009-04-15 05:56:50 UTC
No need to CC me, as I'm already in media-video herd. ;-)
Thanks for the patch, it looks great!
Comment 4 Davide Pesavento (RETIRED) gentoo-dev 2009-04-15 21:52:35 UTC
(In reply to comment #3)
> No need to CC me, as I'm already in media-video herd. ;-)
> 

Oops! Sorry about that... :)
Comment 5 Alexis Ballier gentoo-dev 2009-05-08 09:59:45 UTC
ping? the usage of 'make' instead of $(MAKE) in the makefiles breaks the build on fbsd and this patch seems to fix it.
Comment 6 Ben de Groot (RETIRED) gentoo-dev 2009-05-08 17:04:48 UTC
Applied in smplayer-0.6.7_p2872-r2.ebuild, thanks for your contribution!
Comment 7 Ingmar Vanhassel 2009-05-09 11:35:48 UTC
(In reply to comment #6)
> Applied in smplayer-0.6.7_p2872-r2.ebuild, thanks for your contribution!

Are you going to upstream these patches?
Comment 8 Ben de Groot (RETIRED) gentoo-dev 2009-05-09 23:52:06 UTC
(In reply to comment #7)
> Are you going to upstream these patches?
> 

Yes, I intend to.