[oe-commits] org.oe.dev merge of '8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1'

[openmoko commit]

merge of '8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1'
     and 'dbabf68495e6b7488bb919520b8942286b4bb565'

Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 29f2e0db8f44aa783f61e86f279c28a128b7c0e1
ViewMTN: http://monotone.openembedded.org/revision/info/29f2e0db8f44aa783f61e86f279c28a128b7c0e1
Files:
1
packages/openmoko2/moko-gtk-engine.bb
packages/mplayer/files/simple_idct_armv5te.S
packages/mplayer/mplayer_svn.bb
Diffs:

#
# mt diff -r8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1 -r29f2e0db8f44aa783f61e86f279c28a128b7c0e1
#
# 
# 
# add_file "packages/openmoko2/moko-gtk-engine.bb"
#  content [07a7a3d2f336737f5cdd0625996442c5b9687030]
# 
============================================================
--- packages/openmoko2/moko-gtk-engine.bb	07a7a3d2f336737f5cdd0625996442c5b9687030
+++ packages/openmoko2/moko-gtk-engine.bb	07a7a3d2f336737f5cdd0625996442c5b9687030
@@ -0,0 +1,14 @@
+DESCRIPTION = "Moko GTK+ theme engine"
+SECTION = "openmoko/libs"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "moko-gtk-theme"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_moko-gtk-theme = "${datadir}/themes"
+RDEPENDS_${PN} = "moko-gtk-theme"
+


#
# mt diff -rdbabf68495e6b7488bb919520b8942286b4bb565 -r29f2e0db8f44aa783f61e86f279c28a128b7c0e1
#
# 
# 
# 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 = ""