[oe-commits] org.oe.dev merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'

[koen commit]

merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
     and 'aa0f52125342f4a172e931fd7a8aa4d951d9f7ec'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1631ad4d30afa15be3c49fbb53c9fcb87c5c1c8e
ViewMTN: http://monotone.openembedded.org/revision/info/1631ad4d30afa15be3c49fbb53c9fcb87c5c1c8e
Files:
1
packages/qmake/qmake2-native/0001-fix-mkspecs.patch
packages/qmake/files/0001-fix-mkspecs.patch
packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch
packages/qmake/files/0008-backport-qt-lib-infix.patch
packages/qmake/qmake2-native/qt-config.patch
packages/qmake/files/qt-config.patch
packages/qmake/qmake2-native/use-lflags-last.patch
packages/qmake/files/use-lflags-last.patch
packages/qmake/qmake2-sdk
packages/qmake/qmake2-sdk/linux-oe-qmake.conf
packages/qmake/qmake2-sdk_2.10a.bb
packages/qmake/qmake2-native.inc
packages/qmake/qmake2-native_2.10a.bb
packages/ffmpeg/ffmpeg_git.bb
Diffs:

#
# mt diff -r45d7f2962e16b25cf29da125c1645096b5d7fe7e -r1631ad4d30afa15be3c49fbb53c9fcb87c5c1c8e
#
#
#
# rename "packages/qmake/qmake2-native/0001-fix-mkspecs.patch"
#     to "packages/qmake/files/0001-fix-mkspecs.patch"
# 
# rename "packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch"
#     to "packages/qmake/files/0008-backport-qt-lib-infix.patch"
# 
# rename "packages/qmake/qmake2-native/qt-config.patch"
#     to "packages/qmake/files/qt-config.patch"
# 
# rename "packages/qmake/qmake2-native/use-lflags-last.patch"
#     to "packages/qmake/files/use-lflags-last.patch"
# 
# add_dir "packages/qmake/qmake2-sdk"
# 
# add_file "packages/qmake/qmake2-sdk/linux-oe-qmake.conf"
#  content [c82809da5345d47e3b84f36c116a3d8f9a283d4d]
# 
# add_file "packages/qmake/qmake2-sdk_2.10a.bb"
#  content [d0be162e9dd2009913ff0eb8a085e605c897c6a1]
# 
# patch "packages/qmake/qmake2-native.inc"
#  from [18bf1cd3568fef0b75bb3527dc1810cb148196b2]
#    to [9a65ca126be59f3596e029277143094715b059be]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [87d12872c36ccf6797ad38776a929652d95a4850]
#    to [ce5fc62363b0cdf63720e3988d06934643bb780f]
#
============================================================
--- packages/qmake/qmake2-sdk/linux-oe-qmake.conf	c82809da5345d47e3b84f36c116a3d8f9a283d4d
+++ packages/qmake/qmake2-sdk/linux-oe-qmake.conf	c82809da5345d47e3b84f36c116a3d8f9a283d4d
@@ -0,0 +1 @@
+include(../linux-g++/qmake.conf)
============================================================
--- packages/qmake/qmake2-sdk_2.10a.bb	d0be162e9dd2009913ff0eb8a085e605c897c6a1
+++ packages/qmake/qmake2-sdk_2.10a.bb	d0be162e9dd2009913ff0eb8a085e605c897c6a1
@@ -0,0 +1,4 @@
+QTVERSION="4.3.3"
+require qmake2-native.inc
+
+inherit sdk
============================================================
--- packages/qmake/qmake2-native.inc	18bf1cd3568fef0b75bb3527dc1810cb148196b2
+++ packages/qmake/qmake2-native.inc	9a65ca126be59f3596e029277143094715b059be
@@ -7,7 +7,6 @@ QTVER = "qtopia-core-opensource-src-${QT
 
 QTVER = "qtopia-core-opensource-src-${QTVERSION}"
 
-FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
            file://0008-backport-qt-lib-infix.patch;patch=1 \
============================================================
--- packages/qmake/qmake2-native_2.10a.bb	87d12872c36ccf6797ad38776a929652d95a4850
+++ packages/qmake/qmake2-native_2.10a.bb	ce5fc62363b0cdf63720e3988d06934643bb780f
@@ -1,2 +1,3 @@ QTVERSION="4.3.3"
 QTVERSION="4.3.3"
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 require ${PN}.inc


#
# mt diff -raa0f52125342f4a172e931fd7a8aa4d951d9f7ec -r1631ad4d30afa15be3c49fbb53c9fcb87c5c1c8e
#
#
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [ca93a225f546068e1e43b3ca41b56423d06c7b75]
#    to [a8a6467f13b3028168ae3bb4c7c5826fa0894061]
#
============================================================
--- packages/ffmpeg/ffmpeg_git.bb	ca93a225f546068e1e43b3ca41b56423d06c7b75
+++ packages/ffmpeg/ffmpeg_git.bb	a8a6467f13b3028168ae3bb4c7c5826fa0894061
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}" 
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
@@ -11,8 +11,8 @@ FFBRANCH ?= "master"
 FFBRANCH_arm = "arm-neon"
 FFBRANCH ?= "master"
 
-SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d"
-SRCREV_arm = "d0e4a018bb80814e4aee450ddf9b4f6d3cb97064"
+SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371"
+SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "