Reviewing merge request #2: Detect mplayer versions that were built from "svn export"ed sources

Detect current mplayer revisions even if they were svn export-ed

If mplayer was built from "svn export"-ed sources, it doesn't know
its svn revision number, causing version detection to fail, and
phonon-mplayer to assume that mplayer is prehistoric.

Take a guess based on the copyright year, if it's from 2010 or
newer, it can't be as prehistoric as assumed.

Also marks the static QRegExps in MPlayerVersion.cpp const, should save a few bytes

Commits that would be merged:

Version 2
  • Version 1
  • Version 2
  • Version 2
  • c86b778
  • 1330353

    • Detect current mplayer revisions even if they were svn export-ed

Showing c86b778-1330353

Comments

→ State changed from Open to Merged

Thanks.
Merged into new repository: https://projects.kde.org/projects/kdesupport/phonon/phonon-mplayer/repository

avatar Harald Sitter | 2011-01-06 17:04:31 UTC

The merge actually broke the build because my patch from back in August used MPLAYER_LOG, which has since been removed.

I've pushed an updated version that works with the current tree (without going through reviewboard, thought it can’t possibly be worse than breaking the build ;) ).

avatar BlankPage AG | 2011-01-07 01:06:07 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository