<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# rename "packages/dbus/dbus-1.1.20"
# to "packages/dbus/dbus-1.2.1"
#
# rename "packages/dbus/dbus-native_1.1.20.bb"
# to "packages/dbus/dbus-native_1.2.1.bb"
#
# rename "packages/dbus/dbus_1.1.20.bb"
# to "packages/dbus/dbus_1.2.1.bb"
#
# rename "packages/php/php-5.2.0"
# to "packages/php/php-5.2.5"
#
# rename "packages/php/php-native_5.2.0.bb"
# to "packages/php/php-native_5.2.5.bb"
#
# rename "packages/php/php_5.2.0.bb"
# to "packages/php/php_5.2.5.bb"
#
# add_dir "packages/mplayer/mplayer-maemo"
#
# add_file "packages/glibc/files/glibc-2.6.1-powerpc-nofpu.patch"
# content [167457c19aba32e53d5e2fcb81e12b113c9872ca]
#
# add_file "packages/mplayer/mplayer-maemo/Makefile-codec-cfg.patch"
# content [e8fa4299aa48ea58e0ca04887fb57332bff48203]
#
# add_file "packages/mplayer/mplayer-maemo/cfg-common-position.patch"
# content [c2950ef9233047e81e410f5cbc645ee66f7b51d8]
#
# add_file "packages/mplayer/mplayer-maemo_svn.bb"
# content [179a8ec90cedd113929925f63488981d1c6ac086]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f6a1ff94020ae53c66eb26d34a5d595a0cf71b3c]
# to [d14b9d4bc46e291462cb85b91a4db972daf4fda9]
#
# patch "packages/dbus/dbus-native_1.2.1.bb"
# from [80d48377314b49295fe94f56ce44b497d2ac75b5]
# to [3b5d50b986229bd81a64621770ea9c54dfac1231]
#
# patch "packages/dbus/dbus_1.2.1.bb"
# from [3eed7451679b21ff1bcacbf99ad5688ff790ea26]
# to [a2cc3e97b81b0b31c12bde4ee5e19b2a7f139f88]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [d7da717daed6dd7a23f3d54789b6f28eafa6314a]
# to [e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [26a0064325df33b3d39788cdff0fcc63dd1f5639]
# to [ce3e78792705f1181bc3f1f39ff095423f46e9ee]
#
============================================================
<font color="#FF6600">--- packages/glibc/files/glibc-2.6.1-powerpc-nofpu.patch 167457c19aba32e53d5e2fcb81e12b113c9872ca</font>
<font color="#009900">+++ packages/glibc/files/glibc-2.6.1-powerpc-nofpu.patch 167457c19aba32e53d5e2fcb81e12b113c9872ca</font>
<font color="#0000FF">@@ -0,0 +1,11 @@</font>
<font color="#009900">+--- dummy-libc/ports/sysdeps/powerpc/nofpu/Makefile 2006-11-22 09:13:11.000000000 -0600</font>
<font color="#009900">++++ libc25/ports/sysdeps/powerpc/nofpu/Makefile 2007-06-07 09:53:05.708240976 -0500</font>
<font color="#009900">+@@ -6,7 +6,7 @@</font>
<font color="#009900">+ endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ ifeq ($(subdir),math)</font>
<font color="#009900">+-libm-support += fenv_const fe_nomask</font>
<font color="#009900">++libm-support += fenv_const</font>
<font color="#009900">+ CPPFLAGS += -I../soft-fp/</font>
<font color="#009900">+ # The follow CFLAGS are a work around for GCC Bugzilla Bug 29253</font>
<font color="#009900">+ # "expand_abs wrong default code for floating point"</font>
============================================================
<font color="#FF6600">--- packages/mplayer/mplayer-maemo/Makefile-codec-cfg.patch e8fa4299aa48ea58e0ca04887fb57332bff48203</font>
<font color="#009900">+++ packages/mplayer/mplayer-maemo/Makefile-codec-cfg.patch e8fa4299aa48ea58e0ca04887fb57332bff48203</font>
<font color="#0000FF">@@ -0,0 +1,11 @@</font>
<font color="#009900">+--- /tmp/Makefile 2008-04-20 15:14:45.637878245 +0200</font>
<font color="#009900">++++ trunk/Makefile 2008-04-20 15:15:10.812438751 +0200</font>
<font color="#009900">+@@ -401,7 +401,7 @@</font>
<font color="#009900">+ windres -o $@ osdep/mplayer.rc</font>
<font color="#009900">+ </font>
<font color="#009900">+ codec-cfg: codec-cfg.c codec-cfg.h help_mp.h</font>
<font color="#009900">+- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@</font>
<font color="#009900">++ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@</font>
<font color="#009900">+ </font>
<font color="#009900">+ codecs.conf.h: codec-cfg etc/codecs.conf</font>
<font color="#009900">+ ./codec-cfg ./etc/codecs.conf > $@</font>
============================================================
<font color="#FF6600">--- packages/mplayer/mplayer-maemo/cfg-common-position.patch c2950ef9233047e81e410f5cbc645ee66f7b51d8</font>
<font color="#009900">+++ packages/mplayer/mplayer-maemo/cfg-common-position.patch c2950ef9233047e81e410f5cbc645ee66f7b51d8</font>
<font color="#0000FF">@@ -0,0 +1,10 @@</font>
<font color="#009900">+--- /tmp/cfg-common.h 2008-04-20 17:19:27.399560700 +0200</font>
<font color="#009900">++++ trunk/cfg-common.h 2008-04-20 17:20:52.853869963 +0200</font>
<font color="#009900">+@@ -97,7 +97,6 @@</font>
<font color="#009900">+ {"endpos", &end_at, CONF_TYPE_TIME_SIZE, 0, 0, 0, NULL},</font>
<font color="#009900">+ </font>
<font color="#009900">+ {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},</font>
<font color="#009900">+- {"use-last-saved-position", &use_last_saved_position, CONF_TYPE_FLAG, 0, -1, 1, NULL},</font>
<font color="#009900">+ </font>
<font color="#009900">+ // AVI specific: force non-interleaved mode</font>
<font color="#009900">+ {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},</font>
============================================================
<font color="#FF6600">--- packages/mplayer/mplayer-maemo_svn.bb 179a8ec90cedd113929925f63488981d1c6ac086</font>
<font color="#009900">+++ packages/mplayer/mplayer-maemo_svn.bb 179a8ec90cedd113929925f63488981d1c6ac086</font>
<font color="#0000FF">@@ -0,0 +1,189 @@</font>
<font color="#009900">+DESCRIPTION = "Open Source multimedia player."</font>
<font color="#009900">+SECTION = "multimedia"</font>
<font color="#009900">+PRIORITY = "optional"</font>
<font color="#009900">+HOMEPAGE = "http://www.mplayerhq.hu/"</font>
<font color="#009900">+DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"</font>
<font color="#009900">+</font>
<font color="#009900">+DEFAULT_PREFERENCE_avr32 = "-1"</font>
<font color="#009900">+</font>
<font color="#009900">+PV = "0.0+1.0rc1+svn${SRCREV}"</font>
<font color="#009900">+</font>
<font color="#009900">+RCONFLICTS_${PN} = "mplayer"</font>
<font color="#009900">+</font>
<font color="#009900">+RDEPENDS = "mplayer-common"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+SRC_URI = "svn://garage.maemo.org/svn/mplayer/;module=trunk;proto=https \</font>
<font color="#009900">+ file://Makefile-codec-cfg.patch;patch=1 \</font>
<font color="#009900">+ file://pld-onlyarm5.patch;patch=1 \</font>
<font color="#009900">+ file://makefile-nostrip.patch;patch=1 \</font>
<font color="#009900">+ file://motion-comp-pld.patch;patch=1 \</font>
<font color="#009900">+ file://cfg-common-position.patch;patch=1 "</font>
<font color="#009900">+</font>
<font color="#009900">+# This is required for the collie machine only as all stacks in that</font>
<font color="#009900">+# machine seem to be set to executable by the toolchain. If someone</font>
<font color="#009900">+# discovers this is more general than please make this more general</font>
<font color="#009900">+# ie. for all armv4 machines.</font>
<font color="#009900">+SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGE_ARCH_collie = "collie"</font>
<font color="#009900">+</font>
<font color="#009900">+PARALLEL_MAKE = ""</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/trunk"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES =+ "mencoder"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN} = "${bindir}/mplayer ${libdir}"</font>
<font color="#009900">+FILES_mencoder = "${bindir}/mencoder"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = " \</font>
<font color="#009900">+ --prefix=/usr \</font>
<font color="#009900">+ --mandir=${mandir} \</font>
<font color="#009900">+ --target=${TARGET_SYS} \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --enable-mencoder \</font>
<font color="#009900">+ --disable-gui \</font>
<font color="#009900">+ --enable-largefiles \</font>
<font color="#009900">+ --disable-linux-devfs \</font>
<font color="#009900">+ --disable-lirc \</font>
<font color="#009900">+ --disable-lircc \</font>
<font color="#009900">+ --disable-joystick \</font>
<font color="#009900">+ --disable-vm \</font>
<font color="#009900">+ --disable-xf86keysym \</font>
<font color="#009900">+ --disable-tv \</font>
<font color="#009900">+ --disable-tv-v4l2 \</font>
<font color="#009900">+ --disable-tv-bsdbt848 \</font>
<font color="#009900">+ --enable-rtc \</font>
<font color="#009900">+ --enable-network \</font>
<font color="#009900">+ --disable-winsock2 \</font>
<font color="#009900">+ --disable-smb \</font>
<font color="#009900">+ --disable-live \</font>
<font color="#009900">+ --disable-dvdnav \</font>
<font color="#009900">+ --disable-dvdread \</font>
<font color="#009900">+ --disable-cdparanoia \</font>
<font color="#009900">+ --enable-freetype \</font>
<font color="#009900">+ --disable-unrarlib \</font>
<font color="#009900">+ --disable-menu \</font>
<font color="#009900">+ --enable-sortsub \</font>
<font color="#009900">+ --disable-fribidi \</font>
<font color="#009900">+ --disable-enca \</font>
<font color="#009900">+ --disable-macosx \</font>
<font color="#009900">+ --disable-macosx-finder-support \</font>
<font color="#009900">+ --disable-macosx-bundle \</font>
<font color="#009900">+ --disable-ftp \</font>
<font color="#009900">+ --disable-vstream \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --disable-gif \</font>
<font color="#009900">+ --enable-png \</font>
<font color="#009900">+ --enable-jpeg \</font>
<font color="#009900">+ --disable-libcdio \</font>
<font color="#009900">+ --disable-liblzo \</font>
<font color="#009900">+ --disable-qtx \</font>
<font color="#009900">+ --disable-xanim \</font>
<font color="#009900">+ --disable-real \</font>
<font color="#009900">+ --disable-xvid \</font>
<font color="#009900">+ --disable-x264 \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --disable-libavutil_so \</font>
<font color="#009900">+ --disable-libavcodec_so \</font>
<font color="#009900">+ --disable-libavformat_so \</font>
<font color="#009900">+ --disable-libpostproc_so \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --enable-tremor-low \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --disable-speex \</font>
<font color="#009900">+ --disable-theora \</font>
<font color="#009900">+ --disable-faac \</font>
<font color="#009900">+ --disable-ladspa \</font>
<font color="#009900">+ --disable-libdv \</font>
<font color="#009900">+ --enable-mad \</font>
<font color="#009900">+ --disable-toolame \</font>
<font color="#009900">+ --disable-twolame \</font>
<font color="#009900">+ --disable-xmms \</font>
<font color="#009900">+ --disable-mp3lib \</font>
<font color="#009900">+ --enable-libmpeg2 \</font>
<font color="#009900">+ --disable-musepack \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --disable-gl \</font>
<font color="#009900">+ --disable-vesa \</font>
<font color="#009900">+ --disable-svga \</font>
<font color="#009900">+ --enable-sdl \</font>
<font color="#009900">+ --disable-aa \</font>
<font color="#009900">+ --disable-caca \</font>
<font color="#009900">+ --disable-ggi \</font>
<font color="#009900">+ --disable-ggiwmh \</font>
<font color="#009900">+ --disable-directx \</font>
<font color="#009900">+ --disable-dxr2 \</font>
<font color="#009900">+ --disable-dxr3 \</font>
<font color="#009900">+ --disable-dvb \</font>
<font color="#009900">+ --disable-dvbhead \</font>
<font color="#009900">+ --disable-mga \</font>
<font color="#009900">+ --disable-xmga \</font>
<font color="#009900">+ --enable-xv \</font>
<font color="#009900">+ --disable-xvmc \</font>
<font color="#009900">+ --disable-vm \</font>
<font color="#009900">+ --disable-xinerama \</font>
<font color="#009900">+ --enable-x11 \</font>
<font color="#009900">+ --enable-fbdev \</font>
<font color="#009900">+ --disable-mlib \</font>
<font color="#009900">+ --disable-3dfx \</font>
<font color="#009900">+ --disable-tdfxfb \</font>
<font color="#009900">+ --disable-s3fb \</font>
<font color="#009900">+ --disable-directfb \</font>
<font color="#009900">+ --disable-zr \</font>
<font color="#009900">+ --disable-bl \</font>
<font color="#009900">+ --disable-tdfxvid \</font>
<font color="#009900">+ --disable-tga \</font>
<font color="#009900">+ --disable-pnm \</font>
<font color="#009900">+ --disable-md5sum \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --enable-alsa \</font>
<font color="#009900">+ --enable-ossaudio \</font>
<font color="#009900">+ --disable-arts \</font>
<font color="#009900">+ --disable-esd \</font>
<font color="#009900">+ --disable-polyp \</font>
<font color="#009900">+ --disable-jack \</font>
<font color="#009900">+ --disable-openal \</font>
<font color="#009900">+ --disable-nas \</font>
<font color="#009900">+ --disable-sgiaudio \</font>
<font color="#009900">+ --disable-sunaudio \</font>
<font color="#009900">+ --disable-win32waveout \</font>
<font color="#009900">+ --enable-select \</font>
<font color="#009900">+ \</font>
<font color="#009900">+ --disable-ass \</font>
<font color="#009900">+ "</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF_append_armv6 = " --enable-armv6 --enable-arm-vfp"</font>
<font color="#009900">+EXTRA_OECONF_append_armv7a = "--enable-armv6 --enable-arm-vfp"</font>
<font color="#009900">+</font>
<font color="#009900">+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)</font>
<font color="#009900">+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt </font>
<font color="#009900">+MY_ARCH := "${PACKAGE_ARCH}"</font>
<font color="#009900">+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"</font>
<font color="#009900">+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "</font>
<font color="#009900">+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-runtime-cpudetection', '',d)} "</font>
<font color="#009900">+</font>
<font color="#009900">+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"</font>
<font color="#009900">+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"</font>
<font color="#009900">+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+ sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure</font>
<font color="#009900">+ sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure</font>
<font color="#009900">+ sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure</font>
<font color="#009900">+ sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure</font>
<font color="#009900">+</font>
<font color="#009900">+ ./configure ${EXTRA_OECONF}</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile () {</font>
<font color="#009900">+ oe_runmake</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc f6a1ff94020ae53c66eb26d34a5d595a0cf71b3c</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc d14b9d4bc46e291462cb85b91a4db972daf4fda9</font>
<font color="#0000FF">@@ -68,6 +68,7 @@ SRCREV_pn-mplayer ?= "26455"</font>
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "26455"
<font color="#009900">+SRCREV_pn-mplayer-maemo ?= "342"</font>
SRCREV_pn-multitap-pad ?= "337"
SRCREV_pn-neod ?= "4219"
SRCREV_pn-netsurf ?= "3859"
============================================================
<font color="#FF6600">--- packages/dbus/dbus-native_1.1.20.bb 80d48377314b49295fe94f56ce44b497d2ac75b5</font>
<font color="#009900">+++ packages/dbus/dbus-native_1.2.1.bb 3b5d50b986229bd81a64621770ea9c54dfac1231</font>
<font color="#0000FF">@@ -8,7 +8,6 @@ SRC_URI = "\</font>
http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
file://tmpdir.patch;patch=1 \
<font color="#FF6600">- file://fix-dbus-launch-x11.patch;patch=1 \</font>
file://dbus-1.init \
"
============================================================
<font color="#FF6600">--- packages/dbus/dbus_1.1.20.bb 3eed7451679b21ff1bcacbf99ad5688ff790ea26</font>
<font color="#009900">+++ packages/dbus/dbus_1.2.1.bb a2cc3e97b81b0b31c12bde4ee5e19b2a7f139f88</font>
<font color="#0000FF">@@ -1,5 +1,5 @@ include dbus.inc</font>
include dbus.inc
<font color="#FF6600">-PR = "r1"</font>
<font color="#009900">+PR = "r0"</font>
<font color="#009900">+#SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"</font>
<font color="#FF6600">-SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"</font>
============================================================
<font color="#FF6600">--- packages/glibc/glibc_2.6.1.bb d7da717daed6dd7a23f3d54789b6f28eafa6314a</font>
<font color="#009900">+++ packages/glibc/glibc_2.6.1.bb e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab</font>
<font color="#0000FF">@@ -63,7 +63,10 @@ SRC_URI_append_sh4 = " file://no-z-defs.</font>
SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
# PowerPC Patches to add support for soft-float
<font color="#FF6600">-SRC_URI_append_powerpc = "file://powerpc-sqrt-hack.diff;patch=1"</font>
<font color="#009900">+SRC_URI_append_powerpc = "\</font>
<font color="#009900">+ file://powerpc-sqrt-hack.diff;patch=1 \</font>
<font color="#009900">+ file://glibc-2.6.1-powerpc-nofpu.patch;patch=1 \</font>
<font color="#009900">+"</font>
S = "${WORKDIR}/glibc-${PV}"
B = "${WORKDIR}/build-${TARGET_SYS}"
============================================================
<font color="#FF6600">--- packages/linux/linux-omap2_git.bb 26a0064325df33b3d39788cdff0fcc63dd1f5639</font>
<font color="#009900">+++ packages/linux/linux-omap2_git.bb ce3e78792705f1181bc3f1f39ff095423f46e9ee</font>
<font color="#0000FF">@@ -2,15 +2,18 @@ FILESDIR = "${@os.path.dirname(bb.data.g</font>
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
<font color="#FF6600">-SRCREV = "8eef374ecb0010acceda6571a46be131f1dc0b86"</font>
<font color="#FF6600">-PV = "2.6.24+2.6.25rc9-git${SRCREV}"</font>
<font color="#009900">+SRCREV = "e015fc7dba8f5002daa0982eb81d33cc72e68e95"</font>
<font color="#009900">+</font>
<font color="#009900">+# The e105fc commit is the merge of 2.6.25 into the omap tree, so we leave of the +git part of PV </font>
<font color="#009900">+#PV = "2.6.25+git${SRCREV}"</font>
<font color="#009900">+PV = "2.6.25"</font>
PR = "r4"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
<font color="#FF6600">-SRC_URI_append_beagleboard = " file://1-rearrange-omap3.patch;patch=1 \</font>
<font color="#009900">+SRC_URI_append_beagleboard = " \</font>
file://2-update-omap3evm-kconfig.patch;patch=1 \
file://3-omap3evm-board.patch;patch=1 \
file://4-omap3evm-config.patch;patch=1 \
</tt></pre>