diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
| commit | 15387c72d5cf1a77a5a0afa6750dae73a8dbc12f (patch) | |
| tree | ab55e077002322c8f245c79c87c6a6f2f7b0ed2e /recipes/mplayer | |
| parent | 7f3d2b172af63fc894f80eece075434b2c5fbbc5 (diff) | |
| parent | e4e52ba358c094952ec868d32524a26dfa4bae89 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/mplayer')
| -rw-r--r-- | recipes/mplayer/mplayer-maemo_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_svn.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb index 4e794d0fbe..af0e7a5277 100644 --- a/recipes/mplayer/mplayer-maemo_svn.bb +++ b/recipes/mplayer/mplayer-maemo_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig DEFAULT_PREFERENCE_avr32 = "-1" -PV = "0.0+1.0rc1+svnr${SRCREV}" +PV = "0.0+1.0rc1+svnr${SRCPV}" PE = "1" RCONFLICTS_${PN} = "mplayer" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index f9bad67a43..8a34dd2f94 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -35,7 +35,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "0.0+1.0rc2+svnr${SRCREV}" +PV = "0.0+1.0rc2+svnr${SRCPV}" PR = "r14" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" |