[oe-commits] org.oe.dev merge of '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
mickeyl commit
oe at amethyst.openembedded.net
Wed Jul 30 12:09:26 UTC 2008
merge of '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
and 'f572f61df65c44a6ea6b9b987560f1edd3171a1b'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7c9788a2519ba064d5c3763c59ce34b41e90b834
ViewMTN: http://monotone.openembedded.org/revision/info/7c9788a2519ba064d5c3763c59ce34b41e90b834
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/mozilla/firefox-3.0
packages/mozilla/firefox-3.0.1
packages/mozilla/firefox_3.0.bb
packages/mozilla/firefox_3.0.1.bb
packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch
packages/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch
packages/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch
packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch
classes/update-rc.d.bbclass
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/linux/gumstix-kernel_2.6.21.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/mozilla/firefox-3.0.1/mozconfig
packages/mozilla/firefox.inc
packages/mythtv/mythtv_0.21.bb
Diffs:
#
# mt diff -r87e3cc07eb2fd42d7850e6b0c1f67268404695d0 -r7c9788a2519ba064d5c3763c59ce34b41e90b834
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e]
# to [840f016202d28dd7d52f92202a9c81d4c69a4e4d]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e
+++ conf/distro/include/sane-srcrevs.inc 840f016202d28dd7d52f92202a9c81d4c69a4e4d
@@ -37,19 +37,19 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
+SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "134"
-SRCREV_pn-illume-theme-asu ?= "134"
-SRCREV_pn-illume-theme-freesmartphone ?= "8128497ad1260202c6ebfb08c11a2253bf81665b"
+SRCREV_pn-illume ?= "170"
+SRCREV_pn-illume-theme-asu ?= "170"
+SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
@@ -71,8 +71,8 @@ SRCREV_pn-linux-ixp4xx ?= "1066"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
-SRCREV_pn-linux-openmoko-devel ?= "9c058ff0d2641df3c36fc3300acb72078d2c41d4"
+SRCREV_pn-linux-openmoko ?= "d4b28ec4e2818207cc0e48b90dbce581e0b779e7"
+SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -81,8 +81,8 @@ SRCREV_pn-matchbox-stroke ?= "1820"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "5cf2a90d86601b2666b4634784853fb51d0d5896"
-SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
+SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "27047"
@@ -159,7 +159,7 @@ SRCREV_pn-python-lightmediascanner = "68
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
+SRCREV_pn-python-pyrtc = "7284c178a66c9fa5b09c658560d26d3f976a79f3"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
@@ -178,4 +178,4 @@ SRCREV_pn-xserver-kdrive-glamo ?= "a5136
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
-SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
#
# mt diff -rf572f61df65c44a6ea6b9b987560f1edd3171a1b -r7c9788a2519ba064d5c3763c59ce34b41e90b834
#
#
#
# rename "packages/mozilla/firefox-3.0"
# to "packages/mozilla/firefox-3.0.1"
#
# rename "packages/mozilla/firefox_3.0.bb"
# to "packages/mozilla/firefox_3.0.1.bb"
#
# add_file "packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch"
# content [67358daefda5443aa9a8a51de82b34c59d55a57d]
#
# add_file "packages/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch"
# content [fa80c2a3be405bca32473edbd7d6d49b182cf5f6]
#
# add_file "packages/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch"
# content [59de7a8531fe7a4d7b7f14ebf9fbd8c20eacfdba]
#
# add_file "packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch"
# content [f227665cd13dd712c7309a402da4b72121a5effd]
#
# patch "classes/update-rc.d.bbclass"
# from [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
# to [08db86d0e91f2c7324b4f7f108a642e92cf9d5c9]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [faf2ab6d14f65eafbe5f12e4f19a9520790bb12b]
# to [e3046b95c386745454ecdf90ff6eed7e7cea6039]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [dfca330567472a5564849f47415794ee946785dd]
# to [4649b54f81c86dc3f8fa7324ed4a5b8ccc3d764c]
#
# patch "packages/linux/gumstix-kernel_2.6.21.bb"
# from [abcf379ae73f3805d3364fbbf7d4e735d4c887b2]
# to [b6e0017b205086127aa8eb5128c339fbd7ca3fb7]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [560914bc9a5ea2d1a400c348659a241349d2640d]
# to [5f82c91745dd8c5f3359f78adb68c498cdb484ac]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [ef14668a9a1c7d97225d194c81aa52ace025f767]
# to [a4478e4132dde28a749922f2365db99a955cd8a9]
#
# patch "packages/mozilla/firefox-3.0.1/mozconfig"
# from [f83ff32cfbbf829044318c7e97590355bcb0c2f5]
# to [2704adff3ffa3175691de0aa03a89add1e4c3169]
#
# patch "packages/mozilla/firefox.inc"
# from [54f017c345bcc873faebc5877dbfa0c6971f006e]
# to [9cdff3e71af462808623a28725cba0f39226935a]
#
# patch "packages/mozilla/firefox_3.0.1.bb"
# from [50a3fa2d75086c5b1a38588f806d0dbb34dacffc]
# to [3cc3084dbdb8556bcde37d7a6be2f522197a3431]
#
# patch "packages/mythtv/mythtv_0.21.bb"
# from [590a51ee6de14a40660a5ab607d88ecb36aaa2ff]
# to [11c9903ba5a2d62b47e984d6c45a432010f6bbab]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch 67358daefda5443aa9a8a51de82b34c59d55a57d
+++ packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch 67358daefda5443aa9a8a51de82b34c59d55a57d
@@ -0,0 +1,75 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Wed, 30 Jul 2008 08:25:51 +0000 (+0100)
+Subject: ARM: NEON L1 cache bug workaround (erratum 451034)
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=26023493baf13e0a67fd6cf08d87be5ff6f7c56d
+
+ARM: NEON L1 cache bug workaround (erratum 451034)
+
+On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
+store in the store buffer, can cause a processor deadlock under
+certain conditions.
+
+Executing a DMB instruction before saving NEON/VFP registers and before
+return to userspace makes it safe to run code which includes similar
+counter-measures. Userspace code can still trigger the deadlock, so
+a different workaround is required to safely run untrusted code.
+
+See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
+---
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 8c75840..1172e14 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1071,6 +1071,22 @@ config NEON
+ Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+ Extension.
+
++config NEON_CACHE_BUG
++ bool "NEON L1 cache bug workaround (erratum 451034)"
++ depends on VFPv3
++ help
++ On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
++ store in the store buffer, can cause a processor deadlock under
++ certain conditions.
++
++ See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
++
++ Say Y to include a workaround.
++
++ WARNING: Even with this option enabled, userspace code can trigger
++ the deadlock. To safely run untrusted code, a different fix is
++ required.
++
+ endmenu
+
+ menu "Userspace binary formats"
+diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
+index 597ed00..e50094e 100644
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
+@@ -68,6 +68,10 @@ no_work_pending:
+ /* perform architecture specific actions before user return */
+ arch_ret_to_user r1, lr
+
++#ifdef CONFIG_NEON_CACHE_BUG
++ dmb
++#endif
++
+ @ slow_restore_user_regs
+ ldr r1, [sp, #S_PSR] @ get calling cpsr
+ ldr lr, [sp, #S_PC]! @ get pc
+diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
+index cccb389..c9d2976 100644
+--- a/include/asm-arm/vfpmacros.h
++++ b/include/asm-arm/vfpmacros.h
+@@ -32,6 +32,9 @@
+
+ @ write all the working registers out of the VFP
+ .macro VFPFSTMIA, base, tmp
++#ifdef CONFIG_NEON_CACHE_BUG
++ dmb
++#endif
+ #if __LINUX_ARM_ARCH__ < 6
+ STC p11, cr0, [\base],#33*4 @ FSTMIAX \base!, {d0-d15}
+ #else
============================================================
--- packages/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch fa80c2a3be405bca32473edbd7d6d49b182cf5f6
+++ packages/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch fa80c2a3be405bca32473edbd7d6d49b182cf5f6
@@ -0,0 +1,45 @@
+From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001
+From: Eduardo Valentin <eduardo.valentin at openpossa.org>
+Date: Thu, 24 Jul 2008 16:05:09 -0400
+Subject: [PATCH 1/1] Remove -Werror from build
+
+Remove -Werror from build
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin at openpossa.org>
+---
+ configure | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index a2d84ab..402e70a 100755
+--- a/configure
++++ b/configure
+@@ -5344,7 +5344,7 @@ if test "$GNU_CC"; then
+ # Don't allow undefined symbols in libraries
+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
+ fi
+- WARNINGS_AS_ERRORS='-Werror'
++ WARNINGS_AS_ERRORS=''
+ DSO_CFLAGS=''
+ DSO_PIC_CFLAGS='-fPIC'
+ _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
+@@ -6811,7 +6811,7 @@ EOF
+ IMPLIB='emximp -o'
+ FILTER='emxexp -o'
+ LDFLAGS='-Zmap'
+- WARNINGS_AS_ERRORS='-Werror'
++ WARNINGS_AS_ERRORS=''
+ MOZ_DEBUG_FLAGS="-g -fno-inline"
+ MOZ_OPTIMIZE_FLAGS="-O2"
+ MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
+@@ -7048,7 +7048,7 @@ else
+ fi
+ rm -f conftest*
+ fi
+- WARNINGS_AS_ERRORS='-Werror'
++ WARNINGS_AS_ERRORS=''
+ MOZ_OPTIMIZE_FLAGS="-xO4"
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@'
+--
+1.5.4.3
============================================================
--- packages/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch 59de7a8531fe7a4d7b7f14ebf9fbd8c20eacfdba
+++ packages/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch 59de7a8531fe7a4d7b7f14ebf9fbd8c20eacfdba
@@ -0,0 +1,42 @@
+From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001
+From: Eduardo Valentin <eduardo.valentin at openpossa.org>
+Date: Fri, 25 Jul 2008 11:20:02 -0400
+Subject: [PATCH 1/1] Fix security cross compile cpu detection error
+
+Fix security cross compile cpu detection error.
+Reference to bug 376279.
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin at openpossa.org>
+---
+ security/coreconf/arch.mk | 2 ++
+ security/manager/Makefile.in | 1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
+index fba38ff..28da32e 100644
+--- a/security/coreconf/arch.mk
++++ b/security/coreconf/arch.mk
+@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+
++ifndef OE_TEST
+ OS_TEST := $(shell uname -m)
++endif
+ ifeq ($(OS_TEST),i86pc)
+ OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+ else
+diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
+index 86119f7..86c09ca 100644
+--- a/security/manager/Makefile.in
++++ b/security/manager/Makefile.in
+@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \
+ RC="$(RC) $(RCFLAGS)" \
+ OS_ARCH="$(OS_ARCH)" \
+ CPU_ARCH="$(TARGET_CPU)" \
++ OS_TEST="$(TARGET_CPU)" \
+ $(NULL)
+ SKIP_CHK=1
+ endif
+--
+1.5.4.3
============================================================
--- packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch f227665cd13dd712c7309a402da4b72121a5effd
+++ packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch f227665cd13dd712c7309a402da4b72121a5effd
@@ -0,0 +1,115 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Tue, 29 Jul 2008 21:13:14 +0000 (+0100)
+Subject: ARM: work around Cortex-A8 erratum 451034
+X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=c6bbb0c33f6f681b8265a43f8744735de5a9d45e
+
+ARM: work around Cortex-A8 erratum 451034
+
+On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
+store in the store buffer, can cause a processor deadlock under
+certain conditions.
+
+A DMB instruction at the start of every NEON function ensures that
+the integer store buffer is always empty before executing any NEON
+store, thus avoiding the deadlock condition.
+
+See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
+---
+
+diff --git b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
+index fa0602d..4fbadfc 100644
+--- b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
++++ b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
+@@ -28,6 +28,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ int h, int x, int y);
+
+ #define PUT_PIXELS_16_X2(vhadd) \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "vld1.64 {d0,d1,d2}, [%[p]], %[line_size] \n\t" \
+ "vld1.64 {d4,d5,d6}, [%[p]], %[line_size] \n\t" \
+@@ -46,6 +47,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "lsl %[l2], %[line_size], #1 \n\t" \
+ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \
+ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ vhadd".u8 q2, q0, q1 \n\t" \
+@@ -69,6 +71,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "vaddl.u8 q10, d1, d3 \n\t" \
+ "vaddl.u8 q9, d4, d6 \n\t" \
+ "vaddl.u8 q11, d5, d7 \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ "vld1.64 {d0,d1,d2}, [%[p0]], %[l2] \n\t" \
+@@ -98,6 +101,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "bgt 1b \n\t"
+
+ #define PUT_PIXELS_8_X2(vhadd) \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "vld1.64 {d0,d1}, [%[p]], %[line_size] \n\t" \
+ "vld1.64 {d2,d3}, [%[p]], %[line_size] \n\t" \
+@@ -116,6 +120,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "lsl %[l2], %[line_size], #1 \n\t" \
+ "vld1.64 {d0}, [%[p0]], %[l2] \n\t" \
+ "vld1.64 {d1}, [%[p1]], %[l2] \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ vhadd".u8 d4, d0, d1 \n\t" \
+@@ -137,6 +142,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "vext.8 d6, d2, d3, #1 \n\t" \
+ "vaddl.u8 q8, d0, d4 \n\t" \
+ "vaddl.u8 q9, d2, d6 \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \
+@@ -161,6 +167,7 @@ static void put_pixels16_neon(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h)
+ {
+ asm volatile(
++ "dmb \n\t"
+ "1: \n\t"
+ "vld1.64 {d0,d1}, [%[pixels]], %[line_size] \n\t"
+ "vld1.64 {d2,d3}, [%[pixels]], %[line_size] \n\t"
+@@ -224,6 +231,7 @@ static void put_pixels8_neon(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h)
+ {
+ asm volatile(
++ "dmb \n\t"
+ "1: \n\t"
+ "vld1.64 {d0}, [%[p]], %[line_size] \n\t"
+ "vld1.64 {d1}, [%[p]], %[line_size] \n\t"
+diff --git b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
+index a766867..8171ee2 100644
+--- b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
++++ b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
+@@ -40,6 +40,8 @@ ff_put_h264_chroma_mc8_neon:
+ sub r4, r4, r5, lsl #3
+ add r4, r4, #64
+
++ dmb
++
+ beq 2f
+
+ add r5, r1, r2
+diff --git b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
+index 943e04f..abda6b2 100644
+--- b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
++++ b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
+@@ -307,9 +307,10 @@ idct_col4_st8:
+ const: .short W1, W2, W3, W4, W5, W6, W7, W4c
+
+ .macro idct_start data
++ push {v1-v3, lr}
+ pld [\data]
+ pld [\data, #64]
+- push {v1-v3, lr}
++ dmb
+ vpush {d8-d15}
+ adr a4, const
+ vld1.64 {d0,d1}, [a4,:128]
============================================================
--- classes/update-rc.d.bbclass aad4a9f7c2ea238e727751a6fd3e2675923cc9be
+++ classes/update-rc.d.bbclass 08db86d0e91f2c7324b4f7f108a642e92cf9d5c9
@@ -45,10 +45,12 @@ python populate_packages_prepend () {
bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
bb.data.update_data(localdata)
- postinst = bb.data.getVar('pkg_postinst', localdata, 1)
- if not postinst:
- postinst = '#!/bin/sh\n'
+ postinst = '#!/bin/sh\n'
postinst += bb.data.getVar('updatercd_postinst', localdata, 1)
+ try:
+ postinst += bb.data.getVar('pkg_postinst', localdata, 1)
+ except:
+ pass
bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
prerm = bb.data.getVar('pkg_prerm', localdata, 1)
if not prerm:
============================================================
--- packages/ffmpeg/ffmpeg_git.bb faf2ab6d14f65eafbe5f12e4f19a9520790bb12b
+++ packages/ffmpeg/ffmpeg_git.bb e3046b95c386745454ecdf90ff6eed7e7cea6039
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r16"
+PR = "r18"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -11,8 +11,8 @@ FFBRANCH ?= "master"
FFBRANCH_arm = "arm-neon"
FFBRANCH ?= "master"
-SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371"
-SRCREV_arm = "699f491ee2d3c3216ef16ea30ec3956f4cb583db"
+SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
+SRCREV_arm = "c6bbb0c33f6f681%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list