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:
cc5576cf6d87985dc414d0b01cb0f51ed9a3759b ([EMAIL PROTECTED])
2. org.openembedded.dev:
cc8daafda388ec1e484dc2e68e1599944893bc76 ([EMAIL PROTECTED])
3. org.openembedded.dev:
d0d14199e17e1467abdae813e8ba7808716e8ae9 ([EMAIL PROTECTED])
--- Begin Message ---
revision: cc5576cf6d87985dc414d0b01cb0f51ed9a3759b
date: 2008-04-23T14:53:18
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
neod: sync from om branch
manifest:
format_version "1"
new_manifest [7d9063862b05e84abb6cc57a287c55f50d3a7800]
old_revision [6ee7f3b85c7ab4d221f4fb91059f7d4ba57b5741]
patch "packages/openmoko2/neod_svn.bb"
from [77e71dfd10c1980ddc0b4131a79af4bc60b05bc1]
to [12ffc1d97e556fe67e2cb1ce0e57497a7e04cf0d]
#
#
# patch "packages/openmoko2/neod_svn.bb"
# from [77e71dfd10c1980ddc0b4131a79af4bc60b05bc1]
# to [12ffc1d97e556fe67e2cb1ce0e57497a7e04cf0d]
#
============================================================
--- packages/openmoko2/neod_svn.bb 77e71dfd10c1980ddc0b4131a79af4bc60b05bc1
+++ packages/openmoko2/neod_svn.bb 12ffc1d97e556fe67e2cb1ce0e57497a7e04cf0d
@@ -1,9 +1,9 @@ SECTION = "openmoko/daemons"
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
-DEPENDS = "gtk+ pulseaudio"
+DEPENDS = "gtk+ pulseaudio apmd"
RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
inherit openmoko2 gconf
--- End Message ---
--- Begin Message ---
revision: cc8daafda388ec1e484dc2e68e1599944893bc76
date: 2008-04-17T19:53:22
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
mplayer svn: update patches, srcrev and EXTRA_OECONF
manifest:
format_version "1"
new_manifest [5c1a1439032efcf48e938f305119351699835b5e]
old_revision [9e850960c7066be30333cf021516f96b380dbf9d]
add_dir "packages/mplayer/mplayer-0.0+1.0rc1"
add_dir "packages/mplayer/mplayer-0.0+1.0rc2"
add_file "packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch"
content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
add_file "packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch"
content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
patch "conf/distro/include/sane-srcrevs.inc"
from [10f12e29fe816db4b1e126a2ef7b16b93f06987d]
to [d0d87ab571957347c93128a5a4c12c23b6f74746]
patch "packages/mplayer/files/Makefile-codec-cfg.patch"
from [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
to [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
patch "packages/mplayer/files/makefile-nostrip-svn.patch"
from [a56997c18d0d3b9bbe0a65391debcd74767affc1]
to [183a1b568605abf4a0dbf75a383fe15163e0c857]
patch "packages/mplayer/mplayer_svn.bb"
from [f0026979fe652d6ac626761aaf876e7c3bdcf065]
to [bca5c726d4d1951bc676f2e3b85e918a3ca0db54]
#
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc1"
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc2"
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [10f12e29fe816db4b1e126a2ef7b16b93f06987d]
# to [d0d87ab571957347c93128a5a4c12c23b6f74746]
#
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
# from [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
# to [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
#
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
# from [a56997c18d0d3b9bbe0a65391debcd74767affc1]
# to [183a1b568605abf4a0dbf75a383fe15163e0c857]
#
# patch "packages/mplayer/mplayer_svn.bb"
# from [f0026979fe652d6ac626761aaf876e7c3bdcf065]
# to [bca5c726d4d1951bc676f2e3b85e918a3ca0db54]
#
============================================================
--- packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch
c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch
c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
@@ -0,0 +1,13 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+- $(HOST_CC) -I. -DCODECS2HTML $< -o $@
++ $(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
============================================================
--- packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch
c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch
c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
@@ -0,0 +1,13 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+- $(HOST_CC) -I. -DCODECS2HTML $< -o $@
++ $(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
============================================================
--- conf/distro/include/sane-srcrevs.inc
10f12e29fe816db4b1e126a2ef7b16b93f06987d
+++ conf/distro/include/sane-srcrevs.inc
d0d87ab571957347c93128a5a4c12c23b6f74746
@@ -67,7 +67,7 @@ SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-matchbox-stroke ?= "1820"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-mplayer ?= "26455"
SRCREV_pn-multitap-pad ?= "337"
SRCREV_pn-neod ?= "4219"
SRCREV_pn-netsurf ?= "3859"
============================================================
--- packages/mplayer/files/Makefile-codec-cfg.patch
c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/files/Makefile-codec-cfg.patch
8f20ee3f42444885368ec66e356a21c2a53dfcdd
@@ -1,13 +1,11 @@
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+--- /tmp/Makefile 2008-04-17 21:41:29.623907292 +0200
++++ trunk/Makefile 2008-04-17 21:42:04.164926258 +0200
+@@ -311,7 +311,7 @@
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-- $(HOST_CC) -I. -DCODECS2HTML $< -o $@
-+ $(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+- $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
++ $(BUILD_CC) -O -I. -DCODECS2HTML $< -o $@
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch
a56997c18d0d3b9bbe0a65391debcd74767affc1
+++ packages/mplayer/files/makefile-nostrip-svn.patch
183a1b568605abf4a0dbf75a383fe15163e0c857
@@ -1,22 +1,20 @@
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile 2007-06-29 14:48:19.000000000 +0100
-+++ trunk/Makefile 2007-06-29 14:48:43.000000000 +0100
-@@ -252,7 +252,7 @@
+--- /tmp/Makefile 2008-04-17 21:48:32.987984542 +0200
++++ trunk/Makefile 2008-04-17 21:48:52.042750779 +0200
+@@ -337,7 +337,7 @@
if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf
$(CONFDIR)/codecs.conf.old ; fi
install-mplayer: mplayer$(EXESUF)
- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
-+ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
++ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
install-mplayer-man:
- for i in $(MAN_LANG); do \
-@@ -265,7 +265,7 @@
+ for lang in $(MAN_LANG); do \
+@@ -350,7 +350,7 @@
done
install-mencoder: mencoder$(EXESUF)
- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
+ $(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
- for i in $(MAN_LANG); do \
- if test "$$i" = en ; then \
+ for lang in $(MAN_LANG); do \
+ if test "$$lang" = en ; then \
cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
============================================================
--- packages/mplayer/mplayer_svn.bb f0026979fe652d6ac626761aaf876e7c3bdcf065
+++ packages/mplayer/mplayer_svn.bb bca5c726d4d1951bc676f2e3b85e918a3ca0db54
@@ -82,7 +82,6 @@ EXTRA_OECONF = " \
--disable-dvdread-internal \
--disable-cdparanoia \
--enable-freetype \
- --disable-unrarlib \
--disable-menu \
--enable-sortsub \
--disable-fribidi \
@@ -161,7 +160,7 @@ EXTRA_OECONF = " \
--enable-ossaudio \
--disable-arts \
--disable-esd \
- --disable-polyp \
+ --disable-pulse \
--disable-jack \
--disable-openal \
--disable-nas \
@@ -177,6 +176,10 @@ EXTRA_OECONF_append_hx4700 = " --enable-
EXTRA_OECONF_append_c7x0 = " --enable-imageon "
EXTRA_OECONF_append_hx4700 = " --enable-imageon "
+EXTRA_OECONF_append_armv6 = " --enable-armv6 "
+EXTRA_OECONF_append_armv7a = "--enable-armv6 "
+
+
#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}"
@@ -188,6 +191,10 @@ EXTRA_OECONF_append = " [EMAIL PROTECTED]
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() {
cp ${WORKDIR}/vo_w100.c ${S}/libvo
cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
--- End Message ---
--- Begin Message ---
revision: d0d14199e17e1467abdae813e8ba7808716e8ae9
date: 2008-04-29T13:43:23
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
multitap-pad svn bring back, bring back, oh bring back my bonnie to me, to
meeeee
manifest:
format_version "1"
new_manifest [e9ecd9bb849baf3608a4c9c45c749ee5ac147737]
old_revision [1031d336d54f1e96ac2059871247d2d9a344f2fc]
add_dir "packages/multitap-pad"
add_dir "packages/multitap-pad/files"
add_file "packages/multitap-pad/files/80multitappad"
content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
add_file "packages/multitap-pad/multitap-pad_svn.bb"
content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_file "packages/multitap-pad/files/80multitappad"
# content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
#
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
# content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
============================================================
--- packages/multitap-pad/files/80multitappad
b613cc7c89d800c205b89dd7013c4b3ba309b319
+++ packages/multitap-pad/files/80multitappad
b613cc7c89d800c205b89dd7013c4b3ba309b319
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+ if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0"
]; then
+ CMD="multitap-pad -d -o landscape"
+ elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0"
]; then
+ CMD="multitap-pad -d -o portrait"
+ fi
+else
+ CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+ (sleep 2 && $CMD) &
+fi
============================================================
--- packages/multitap-pad/multitap-pad_svn.bb
8f2b626f58690dd52e509cacab5977c5f52270e2
+++ packages/multitap-pad/multitap-pad_svn.bb
8f2b626f58690dd52e509cacab5977c5f52270e2
@@ -0,0 +1,47 @@
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+ file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+ ${libdir} \
+ ${sysconfdir} \
+ ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+ ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+ ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+ ${libdir}/matchbox-panel/*.a \
+ ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ install -m 755 ${WORKDIR}/80multitappad
${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
