Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. org.openembedded.dev:
e8fcabd728e71161632456a9cb36e4e606e6dda8 ([EMAIL PROTECTED])
2. org.openembedded.dev:
ea22d358a831b54fb4cab9ba737aa7318d20aa38 ([EMAIL PROTECTED])
--- Begin Message ---
revision: e8fcabd728e71161632456a9cb36e4e606e6dda8
date: 2008-04-28T15:39:55
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
hostap-daemon: use version 0.5.10 by default
manifest:
format_version "1"
new_manifest [dffcf499c23c55ee479ca51a9af718eb8282b2c3]
old_revision [4ccbb7395e4fcfcca16dc9073c276a7cf4c1616e]
delete "packages/hostap/hostap-daemon-0.6.3"
delete "packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff"
delete "packages/hostap/hostap-daemon_0.5.1.bb"
delete "packages/hostap/hostap-daemon_0.6.3.bb"
add_dir "packages/hostap/hostap-daemon-0.5.10"
add_file "packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff"
content [e291454f9d39e1948a9b6487276aa4d641662bde]
add_file "packages/hostap/hostap-daemon_0.5.10.bb"
content [1ef529afd5463790fc19d5fa6b3768c4b672ced8]
#
#
# delete "packages/hostap/hostap-daemon-0.6.3"
#
# delete "packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff"
#
# delete "packages/hostap/hostap-daemon_0.5.1.bb"
#
# delete "packages/hostap/hostap-daemon_0.6.3.bb"
#
# add_dir "packages/hostap/hostap-daemon-0.5.10"
#
# add_file "packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff"
# content [e291454f9d39e1948a9b6487276aa4d641662bde]
#
# add_file "packages/hostap/hostap-daemon_0.5.10.bb"
# content [1ef529afd5463790fc19d5fa6b3768c4b672ced8]
#
============================================================
--- packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
e291454f9d39e1948a9b6487276aa4d641662bde
+++ packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
e291454f9d39e1948a9b6487276aa4d641662bde
@@ -0,0 +1,31 @@
+diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile
+--- hostapd-0.5.10.orig/Makefile 2008-02-20 01:08:54.000000000 +0100
++++ hostapd-0.5.10/Makefile 2008-04-28 17:01:36.000000000 +0200
+@@ -1,10 +1,14 @@
++ifndef CC
+ CC=gcc
++endif
+ DIR_WPA_SUPPLICANT=.
+
+ ifndef CFLAGS
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -333,10 +337,10 @@
+ fi
+
+ install: all
+- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+
+ hostapd: $(OBJS)
+- $(CC) -o hostapd $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+
+ driver_conf.c: Makefile .config
+ rm -f driver_conf.c
============================================================
--- packages/hostap/hostap-daemon_0.5.10.bb
1ef529afd5463790fc19d5fa6b3768c4b672ced8
+++ packages/hostap/hostap-daemon_0.5.10.bb
1ef529afd5463790fc19d5fa6b3768c4b672ced8
@@ -0,0 +1,42 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi";
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl [EMAIL PROTECTED]("COMBINED_FEATURES", "pci", "madwifi-ng",
"",d)}"
+
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm'
on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "[EMAIL PROTECTED]('COMBINED_FEATURES', 'pci',
'${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+ file://makefile-cross.diff;patch=1 \
+ file://defconfig \
+ file://init"
+
+S = "${WORKDIR}/hostapd-${PV}"
+
+export HAS_PCI = "[EMAIL PROTECTED]('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ if [ "x$HAS_PCI" == "x1" ] ; then
+ echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+ echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+ fi
+}
+
+do_compile() {
+ make
+}
+
+do_install() {
+ install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+ make TARGET_PREFIX=${D}${sbindir} install
+ install -m 0644 hostapd.conf ${D}${sysconfdir}
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
--- End Message ---
--- Begin Message ---
revision: ea22d358a831b54fb4cab9ba737aa7318d20aa38
date: 2008-04-21T00:42:58
author: [EMAIL PROTECTED]
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]
#
#
# 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 \
"
#
#
# 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 = "[EMAIL PROTECTED]('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt',
'${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "[EMAIL PROTECTED]('MACHINE_FEATURES', 'iwmmxt',
'-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " [EMAIL PROTECTED]('MACHINE_FEATURES', 'iwmmxt',
'--enable-pxa --enable-iwmmxt', '',d)} "
+EXTRA_OECONF_append = " [EMAIL PROTECTED]('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 = "[EMAIL PROTECTED](bb.data.g
FILESDIR = "[EMAIL
PROTECTED](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 \
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
