diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/madplay/madplay_0.15.2b.bb | 1 | ||||
| -rw-r--r-- | packages/mono/mono_1.2.6.inc | 1 | ||||
| -rw-r--r-- | packages/mozilla/firefox.inc | 1 | ||||
| -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 | ||||
| -rw-r--r-- | packages/telepathy/empathy_2.24.0.bb | 2 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-omap3_git.bb | 6 | ||||
| -rw-r--r-- | packages/webkit/webkit-gtk_svn.bb | 1 |
9 files changed, 17 insertions, 7 deletions
diff --git a/packages/madplay/madplay_0.15.2b.bb b/packages/madplay/madplay_0.15.2b.bb index d942b965e2..9c5bc5a742 100644 --- a/packages/madplay/madplay_0.15.2b.bb +++ b/packages/madplay/madplay_0.15.2b.bb @@ -8,5 +8,6 @@ HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz" inherit autotools +ARM_INSTRUCTION_SET = "arm" FILES_${PN} = "${bindir}/madplay" diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc index c9644cbce5..36eece0148 100644 --- a/packages/mono/mono_1.2.6.inc +++ b/packages/mono/mono_1.2.6.inc @@ -8,6 +8,7 @@ SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \ S = "${WORKDIR}/mono-1.2.6" inherit autotools +ARM_INSTRUCTION_SET = "arm" EXTRA_OECONF_arm = "--without-tls" EXTRA_OECONF_mipsel = "--without-tls" diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 0684214fc6..419398de95 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -2,6 +2,7 @@ DESCRIPTION ?= "Browser made by mozilla" SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" PARALLEL_MAKE = "" +ARM_INSTRUCTION_SET = "arm" MOZPV ?= "${PV}" 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" diff --git a/packages/telepathy/empathy_2.24.0.bb b/packages/telepathy/empathy_2.24.0.bb index 66c8210adf..b9cf1d5ac9 100644 --- a/packages/telepathy/empathy_2.24.0.bb +++ b/packages/telepathy/empathy_2.24.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Empathy: a Telepathy based IM client" HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" LICENSE = "GPL" -DEPENDS = "python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" +DEPENDS = "gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" RDEPENDS = "telepathy-mission-control" RRECOMMENDS = "telepathy-gabble" diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb index 5be3657fba..56ca67bb60 100644 --- a/packages/u-boot/u-boot-omap3_git.bb +++ b/packages/u-boot/u-boot-omap3_git.bb @@ -2,10 +2,10 @@ require u-boot.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}" -SRCREV = "c492706ba046124333323273f6fc21123360cb50" +SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5" -PV = "2008.10-rc1+${PR}+git${SRCREV}" -PR ="r1" +PV = "2008.10+${PR}+git${SRCREV}" +PR ="r2" SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ " diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 92df2d0f94..3abf37a409 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -27,6 +27,7 @@ S = "${WORKDIR}/" inherit autotools pkgconfig lib_package +ARM_INSTRUCTION_SET = "arm" # FIXME: Segfaulting without --with-http-backend=curl EXTRA_OECONF = "\ --enable-debug=no \ |