[oe-commits] org.oe.dev merge of 'a94d96e725d7b1b902a9b09b6c9628a3d59d5cf8'

[koen commit]

merge of 'a94d96e725d7b1b902a9b09b6c9628a3d59d5cf8'
     and 'e70bb85147c1884a42eb239c03283cb35fc63033'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 8a007578b0190f3f0fccf40442e64ab53ec35d20
ViewMTN: http://monotone.openembedded.org/revision/info/8a007578b0190f3f0fccf40442e64ab53ec35d20
Files:
1
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.bb
packages/ffmpeg/ffmpeg_git.bb
Diffs:

#
# mt diff -ra94d96e725d7b1b902a9b09b6c9628a3d59d5cf8 -r8a007578b0190f3f0fccf40442e64ab53ec35d20
#
#
#
# patch "packages/mozilla/firefox.inc"
#  from [54f017c345bcc873faebc5877dbfa0c6971f006e]
#    to [9cdff3e71af462808623a28725cba0f39226935a]
# 
# patch "packages/mozilla/firefox_3.0.bb"
#  from [50a3fa2d75086c5b1a38588f806d0dbb34dacffc]
#    to [0262c6a65c4556a64c87eab13f684f1571b6a4ad]
#
============================================================
--- packages/mozilla/firefox.inc	54f017c345bcc873faebc5877dbfa0c6971f006e
+++ packages/mozilla/firefox.inc	9cdff3e71af462808623a28725cba0f39226935a
@@ -1,7 +1,5 @@ SRC_URI += "file://mozilla-firefox.png f
 SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
 
-PARALLEL_MAKE = ""
-
 PACKAGES =+ "firefox-inspector"
 
 FILES_firefox-inspector = "	${libdir}/firefox-${PV}/chrome/inspector* \
============================================================
--- packages/mozilla/firefox_3.0.bb	50a3fa2d75086c5b1a38588f806d0dbb34dacffc
+++ packages/mozilla/firefox_3.0.bb	0262c6a65c4556a64c87eab13f684f1571b6a4ad
@@ -21,6 +21,8 @@ require firefox.inc
 inherit mozilla
 require firefox.inc
 
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
+
 do_unpack2() {
 	cp -pPr ${WORKDIR}/js/src* ${S}/js/
 }


#
# mt diff -re70bb85147c1884a42eb239c03283cb35fc63033 -r8a007578b0190f3f0fccf40442e64ab53ec35d20
#
#
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [faf2ab6d14f65eafbe5f12e4f19a9520790bb12b]
#    to [78d0391ecaae3f48ad1d0e048b2e3d7601118d7e]
#
============================================================
--- packages/ffmpeg/ffmpeg_git.bb	faf2ab6d14f65eafbe5f12e4f19a9520790bb12b
+++ packages/ffmpeg/ffmpeg_git.bb	78d0391ecaae3f48ad1d0e048b2e3d7601118d7e
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}" 
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r16"
+PR = "r17"
 
 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 = "32fb69d610d0f9136bb4f827b42600a819f96f00"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "