org.openembedded.dev: ea22d358a831b54fb4cab9ba737aa7318d20aa38

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 21:07:28 CEST 2008


revision:            ea22d358a831b54fb4cab9ba737aa7318d20aa38
date:                2008-04-21T00:42:58
author:              mickeyl at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
     and 'ec238858461bb40d136b48ac17f1ad9ee6b50c9e'

manifest:
format_version "1"

new_manifest [8ecce79e4a90aebfc908a8b5850eff613fa8169a]

old_revision [db0a0f72b9b3c3cf83b68ea72965aba206092766]

patch "packages/dbus/dbus-native_1.2.1.bb"
 from [80d48377314b49295fe94f56ce44b497d2ac75b5]
   to [3b5d50b986229bd81a64621770ea9c54dfac1231]

old_revision [ec238858461bb40d136b48ac17f1ad9ee6b50c9e]

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/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 [bdc205b44e29d37fda3aeaf31ade96e94eac2b7b]
   to [78cf2b1510afd6b5a1ce69e6944feab821737a24]

patch "packages/linux/linux-omap2_git.bb"
 from [26a0064325df33b3d39788cdff0fcc63dd1f5639]
   to [ce3e78792705f1181bc3f1f39ff095423f46e9ee]
-------------- next part --------------
#
#
# patch "packages/dbus/dbus-native_1.2.1.bb"
#  from [80d48377314b49295fe94f56ce44b497d2ac75b5]
#    to [3b5d50b986229bd81a64621770ea9c54dfac1231]
#
============================================================
--- packages/dbus/dbus-native_1.2.1.bb	80d48377314b49295fe94f56ce44b497d2ac75b5
+++ packages/dbus/dbus-native_1.2.1.bb	3b5d50b986229bd81a64621770ea9c54dfac1231
@@ -8,7 +8,6 @@ SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
-  file://fix-dbus-launch-x11.patch;patch=1 \
   file://dbus-1.init \
 "
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/62ef6b93/attachment.htm 
-------------- next part --------------
#
#
# 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/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 [bdc205b44e29d37fda3aeaf31ade96e94eac2b7b]
#    to [78cf2b1510afd6b5a1ce69e6944feab821737a24]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [26a0064325df33b3d39788cdff0fcc63dd1f5639]
#    to [ce3e78792705f1181bc3f1f39ff095423f46e9ee]
#
============================================================
--- packages/mplayer/mplayer-maemo/Makefile-codec-cfg.patch	e8fa4299aa48ea58e0ca04887fb57332bff48203
+++ packages/mplayer/mplayer-maemo/Makefile-codec-cfg.patch	e8fa4299aa48ea58e0ca04887fb57332bff48203
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2008-04-20 15:14:45.637878245 +0200
++++ trunk/Makefile	2008-04-20 15:15:10.812438751 +0200
+@@ -401,7 +401,7 @@
+ 	windres -o $@ osdep/mplayer.rc
+ 
+ codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
++	$(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
+ 
+ codecs.conf.h: codec-cfg etc/codecs.conf
+ 	./codec-cfg ./etc/codecs.conf > $@
============================================================
--- packages/mplayer/mplayer-maemo/cfg-common-position.patch	c2950ef9233047e81e410f5cbc645ee66f7b51d8
+++ packages/mplayer/mplayer-maemo/cfg-common-position.patch	c2950ef9233047e81e410f5cbc645ee66f7b51d8
@@ -0,0 +1,10 @@
+--- /tmp/cfg-common.h	2008-04-20 17:19:27.399560700 +0200
++++ trunk/cfg-common.h	2008-04-20 17:20:52.853869963 +0200
+@@ -97,7 +97,6 @@
+ 	{"endpos", &end_at, CONF_TYPE_TIME_SIZE, 0, 0, 0, NULL},
+ 
+ 	{"edl", &edl_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL},
+-	{"use-last-saved-position", &use_last_saved_position, CONF_TYPE_FLAG, 0, -1, 1, NULL},
+ 
+ 	// AVI specific: force non-interleaved mode
+ 	{"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},
============================================================
--- packages/mplayer/mplayer-maemo_svn.bb	179a8ec90cedd113929925f63488981d1c6ac086
+++ packages/mplayer/mplayer-maemo_svn.bb	179a8ec90cedd113929925f63488981d1c6ac086
@@ -0,0 +1,189 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+
+DEFAULT_PREFERENCE_avr32 = "-1"
+
+PV = "0.0+1.0rc1+svn${SRCREV}"
+
+RCONFLICTS_${PN} = "mplayer"
+
+RDEPENDS = "mplayer-common"
+LICENSE = "GPL"
+SRC_URI = "svn://garage.maemo.org/svn/mplayer/;module=trunk;proto=https \
+           file://Makefile-codec-cfg.patch;patch=1 \
+           file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip.patch;patch=1 \
+           file://motion-comp-pld.patch;patch=1 \
+	   file://cfg-common-position.patch;patch=1 "
+
+# This is required for the collie machine only as all stacks in that
+# machine seem to be set to executable by the toolchain. If someone
+# discovers this is more general than please make this more general
+# ie. for all armv4 machines.
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+
+PACKAGE_ARCH_collie = "collie"
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/trunk"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer ${libdir}"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " \
+        --prefix=/usr \
+	--mandir=${mandir} \
+        --target=${TARGET_SYS} \
+	\
+	--enable-mencoder \
+	--disable-gui \
+	--enable-largefiles \
+	--disable-linux-devfs \
+	--disable-lirc \
+	--disable-lircc \
+        --disable-joystick \
+        --disable-vm \
+        --disable-xf86keysym \
+	--disable-tv \
+        --disable-tv-v4l2 \
+        --disable-tv-bsdbt848 \
+	--enable-rtc \
+        --enable-network \
+        --disable-winsock2 \
+	--disable-smb \
+        --disable-live \
+	--disable-dvdnav \
+        --disable-dvdread \
+        --disable-cdparanoia \
+        --enable-freetype \
+        --disable-unrarlib \
+        --disable-menu \
+        --enable-sortsub \
+        --disable-fribidi \
+        --disable-enca \
+        --disable-macosx \
+        --disable-macosx-finder-support \
+        --disable-macosx-bundle \
+        --disable-ftp \
+        --disable-vstream \
+        \
+        --disable-gif \
+        --enable-png \
+        --enable-jpeg \
+        --disable-libcdio \
+        --disable-liblzo \
+        --disable-qtx \
+        --disable-xanim \
+        --disable-real \
+        --disable-xvid \
+        --disable-x264 \
+        \
+        --disable-libavutil_so \
+        --disable-libavcodec_so \
+        --disable-libavformat_so \
+        --disable-libpostproc_so \
+        \
+	--enable-tremor-low \
+        \
+        --disable-speex \
+        --disable-theora \
+        --disable-faac \
+        --disable-ladspa \
+        --disable-libdv \
+        --enable-mad \
+        --disable-toolame \
+        --disable-twolame \
+        --disable-xmms \
+	--disable-mp3lib \
+        --enable-libmpeg2 \
+        --disable-musepack \
+	\
+        --disable-gl \
+        --disable-vesa \
+        --disable-svga \
+	--enable-sdl \
+        --disable-aa \
+        --disable-caca \
+        --disable-ggi \
+        --disable-ggiwmh \
+        --disable-directx \
+        --disable-dxr2 \
+        --disable-dxr3 \
+        --disable-dvb \
+        --disable-dvbhead \
+        --disable-mga \
+        --disable-xmga \
+        --enable-xv \
+        --disable-xvmc \
+        --disable-vm \
+        --disable-xinerama \
+        --enable-x11 \
+	--enable-fbdev \
+        --disable-mlib \
+        --disable-3dfx \
+        --disable-tdfxfb \
+        --disable-s3fb \
+        --disable-directfb \
+        --disable-zr \
+        --disable-bl \
+        --disable-tdfxvid \
+        --disable-tga \
+        --disable-pnm \
+        --disable-md5sum \
+        \
+        --enable-alsa \
+        --enable-ossaudio \
+        --disable-arts \
+        --disable-esd \
+        --disable-polyp \
+        --disable-jack \
+        --disable-openal \
+        --disable-nas \
+        --disable-sgiaudio \
+        --disable-sunaudio \
+        --disable-win32waveout \
+        --enable-select \
+        \
+	--disable-ass \
+        "
+
+EXTRA_OECONF_append_armv6 = " --enable-armv6 --enable-arm-vfp"
+EXTRA_OECONF_append_armv7a = "--enable-armv6 --enable-arm-vfp"
+
+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt 
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-runtime-cpudetection', '',d)} "
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+
+do_configure() {
+	sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
+	sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
+	sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
+	sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
+
+        ./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake
+}
+
============================================================
--- conf/distro/include/sane-srcrevs.inc	bdc205b44e29d37fda3aeaf31ade96e94eac2b7b
+++ conf/distro/include/sane-srcrevs.inc	78cf2b1510afd6b5a1ce69e6944feab821737a24
@@ -68,6 +68,7 @@ SRCREV_pn-mplayer ?= "26455"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "26455"
+SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "337"
 SRCREV_pn-neod ?= "4219"
 SRCREV_pn-netsurf ?= "3859"
============================================================
--- packages/linux/linux-omap2_git.bb	26a0064325df33b3d39788cdff0fcc63dd1f5639
+++ packages/linux/linux-omap2_git.bb	ce3e78792705f1181bc3f1f39ff095423f46e9ee
@@ -2,15 +2,18 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "8eef374ecb0010acceda6571a46be131f1dc0b86"
-PV = "2.6.24+2.6.25rc9-git${SRCREV}"
+SRCREV = "e015fc7dba8f5002daa0982eb81d33cc72e68e95"
+
+# The e105fc commit is the merge of 2.6.25 into the omap tree, so we leave of the +git part of PV  
+#PV = "2.6.25+git${SRCREV}"
+PV = "2.6.25"
 PR = "r4"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
            file://defconfig"
 
-SRC_URI_append_beagleboard = " file://1-rearrange-omap3.patch;patch=1 \
+SRC_URI_append_beagleboard = " \
                                file://2-update-omap3evm-kconfig.patch;patch=1 \
                                file://3-omap3evm-board.patch;patch=1 \
                                file://4-omap3evm-config.patch;patch=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/62ef6b93/attachment-0001.htm 


More information about the commitlog mailing list