diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-15 17:01:45 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-15 17:01:45 +0000 |
| commit | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (patch) | |
| tree | 67eb189ccb43ad563221f838ea7d0fb5aac22cff /packages/mplayer/mplayer_svn.bb | |
| parent | 37eaf01d8cb40b66e913205e5ef56471e2b6dc16 (diff) | |
| parent | 7a59e5082766cb19288aecdf72b9c0703071d3e8 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/mplayer/mplayer_svn.bb')
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 26170c6ede..b0f12504d4 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -36,11 +36,13 @@ PACKAGE_ARCH_collie = "collie" PACKAGE_ARCH_c7x0 = "c7x0" PACKAGE_ARCH_hx4700 = "hx4700" +ARM_INSTRUCTION_SET = "ARM" + RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc2+svnr${SRCREV}" -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" |