[oe-commits] org.oe.dev merge of '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'

[xora commit]

merge of '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'
     and 'eee5593805c1b699d11b41c5bf39860df0d24ca6'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1
ViewMTN: http://monotone.openembedded.org/revision/info/8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1
Files:
1
packages/mplayer/files/simple_idct_armv5te.S
packages/mplayer/mplayer_svn.bb
packages/dbus/dbus/fix-segfault.patch
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.1.bb
packages/dbus/dbus_1.0.2.bb
packages/openmoko2/libmokoui2_svn.bb
Diffs:

#
# mt diff -r4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e -r8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1
#
# 
# 
# patch "packages/mplayer/files/simple_idct_armv5te.S"
#  from [362eab5f1e2af81e86f48407f19dda83b03e5101]
#    to [fc4be210fa21372489890682636c49da9fa17135]
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [f700ecbdb2d87491a28590b3119f8335348a2655]
#    to [b3e470c9f853cae8a72c5f6a532de191c846ff64]
# 
============================================================
--- packages/mplayer/files/simple_idct_armv5te.S	362eab5f1e2af81e86f48407f19dda83b03e5101
+++ packages/mplayer/files/simple_idct_armv5te.S	fc4be210fa21372489890682636c49da9fa17135
@@ -25,7 +25,7 @@
 .arch armv5te
 
 /* IMPORTANT: this value should be the same as defined in dsputil.h */
-#define MAX_NEG_CROP 2048
+#define MAX_NEG_CROP 1024
 
 /*
  * ARM EABI guarantees 8 byte stack alignment, so we can use LDRD instructions
============================================================
--- packages/mplayer/mplayer_svn.bb	f700ecbdb2d87491a28590b3119f8335348a2655
+++ packages/mplayer/mplayer_svn.bb	b3e470c9f853cae8a72c5f6a532de191c846ff64
@@ -35,7 +35,7 @@ PV = "0.0+1.0rc1+svnr${SRCREV}"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""


#
# mt diff -reee5593805c1b699d11b41c5bf39860df0d24ca6 -r8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1
#
# 
# 
# delete "packages/dbus/dbus/fix-segfault.patch"
# 
# patch "packages/dbus/dbus.inc"
#  from [c8b2145db8681919b67a8e50346da67c283e0233]
#    to [f2c229e2a89e9b3da17fe11252f2d44b73ce7007]
# 
# patch "packages/dbus/dbus_1.0.1.bb"
#  from [b55c8edfb32c457a02e1e498f6b14acebc1bbf8e]
#    to [e01bd6fd36c624af9c31cd0f6020204db116a678]
# 
# patch "packages/dbus/dbus_1.0.2.bb"
#  from [a8ce6355ed3da04736b057936a57f1aeed630228]
#    to [e167627a54c23293d250970ba68ae39a4a15fa60]
# 
# patch "packages/openmoko2/libmokoui2_svn.bb"
#  from [9e415b0e1b1fa3a3d28466bdab59e21147011500]
#    to [fc7b7b01cd80ded36029ab7f5bcebade47a07051]
# 
============================================================
--- packages/dbus/dbus.inc	c8b2145db8681919b67a8e50346da67c283e0233
+++ packages/dbus/dbus.inc	f2c229e2a89e9b3da17fe11252f2d44b73ce7007
@@ -7,7 +7,6 @@ SRC_URI = "http://dbus.freedesktop.org/r
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
 	   file://dbus-1.init \
-	   file://fix-segfault.patch;patch=1 \
            file://cross.patch;patch=1 \
 	   file://fix-install-daemon.patch;patch=1"
 
============================================================
--- packages/dbus/dbus_1.0.1.bb	b55c8edfb32c457a02e1e498f6b14acebc1bbf8e
+++ packages/dbus/dbus_1.0.1.bb	e01bd6fd36c624af9c31cd0f6020204db116a678
@@ -1,5 +1,5 @@ SRC_URI += "file://dbus-exploit-fix.patc
 require dbus.inc
 
 SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
 
+PR = "r4"
-PR = "r3"
============================================================
--- packages/dbus/dbus_1.0.2.bb	a8ce6355ed3da04736b057936a57f1aeed630228
+++ packages/dbus/dbus_1.0.2.bb	e167627a54c23293d250970ba68ae39a4a15fa60
@@ -1,5 +1,5 @@ SRC_URI += " file://fix-waitpid.patch;pa
 require dbus.inc
 
 SRC_URI += " file://fix-waitpid.patch;patch=1"
 
+PR = "r4"
-PR = "r3"
============================================================
--- packages/openmoko2/libmokoui2_svn.bb	9e415b0e1b1fa3a3d28466bdab59e21147011500
+++ packages/openmoko2/libmokoui2_svn.bb	fc7b7b01cd80ded36029ab7f5bcebade47a07051
@@ -1,14 +1,15 @@ PV = "0.1.0+svn${SVNREV}"
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }
 
-
-
-