diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-11-15 09:12:20 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-15 09:12:20 +0100 |
| commit | 6beb5e9ae29e4351ab3fc1c8ce7ba0d35ea62bfe (patch) | |
| tree | dcbe4fa545b5593eed4d4e5928d628530384c79f | |
| parent | ca344437bba2733bd3cc8b45fa113d3302e2a981 (diff) | |
mplayer: ARM_INSTRUCTION_SET = "ARM"
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 4 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc2.bb | 4 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index cf899861a0..d1682435cb 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -37,9 +37,11 @@ SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1" PACKAGE_ARCH_mplayer_collie = "collie" PACKAGE_ARCH_mencoder_collie = "collie" +ARM_INSTRUCTION_SET = "ARM" + RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r17" +PR = "r18" PARALLEL_MAKE = "" diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb index 8ecb205457..9d32fce12f 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc2.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb @@ -40,10 +40,12 @@ PACKAGE_ARCH_collie = "collie" PACKAGE_ARCH_c7x0 = "c7x0" PACKAGE_ARCH_hx4700 = "hx4700" +ARM_INSTRUCTION_SET = "ARM" + RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r9" +PR = "r10" PARALLEL_MAKE = "" 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" |