Send commitlog mailing list submissions to
[email protected]
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. r2244 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu
([EMAIL PROTECTED])
2. r2245 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
3. r2246 - trunk/src/target/OM-2007/openmoko-libs
([EMAIL PROTECTED])
4. r2247 - in trunk/oe/packages: . libxosd ([EMAIL PROTECTED])
5. r2248 - trunk/oe/packages/openmoko-base ([EMAIL PROTECTED])
6. r2249 - trunk/oe/packages/libxosd ([EMAIL PROTECTED])
7. r2250 - in trunk/oe/packages/libxosd: . files
([EMAIL PROTECTED])
8. r2251 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
9. r2252 - trunk/oe/packages/libxosd ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-06-14 08:21:41 +0200 (Thu, 14 Jun 2007)
New Revision: 2244
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
Log:
openmoko-panel-mainmenu: catch up with new dependencies in .pro file
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-06-13 17:13:50 UTC (rev 2243)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-06-14 06:21:41 UTC (rev 2244)
@@ -14,5 +14,7 @@
src/mokodesktop_item.c \
src/stylusmenu.c
+PKGCONFIG += libstartup-notification-1.0
+
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 09:19:03 +0200 (Thu, 14 Jun 2007)
New Revision: 2245
Modified:
trunk/src/target/OM-2007/openmoko-libs/TODO
trunk/src/target/OM-2007/openmoko-libs/configure.ac
trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
Log:
openmoko-libs: add MokoBanner
Modified: trunk/src/target/OM-2007/openmoko-libs/TODO
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/TODO 2007-06-14 06:21:41 UTC (rev
2244)
+++ trunk/src/target/OM-2007/openmoko-libs/TODO 2007-06-14 07:19:03 UTC (rev
2245)
@@ -1,6 +1,6 @@
(Ordered by Priority)
-- MokoApplication -> GSettings, set theme
+- change profiles for audio subsystem
- split up into individually buildable libraries (esp. regarding pkgconfig
support)
- MokoPopupMenu:
-- moko_popup_menu_add_item( label, callback, userdata, notification );
Modified: trunk/src/target/OM-2007/openmoko-libs/configure.ac
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/configure.ac 2007-06-14 06:21:41 UTC
(rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/configure.ac 2007-06-14 07:19:03 UTC
(rev 2245)
@@ -27,13 +27,15 @@
gdk-pixbuf-2.0
libgsmd)
+AM_PATH_LIBXOSD(have_xosd=true,AC_MSG_ERROR([*** Required libxosd not
installed ***]))
+
if test x$MOKO_DEVEL = xon ; then
AC_MSG_NOTICE([removing -O2 from CFLAGS])
CFLAGS="-g -Wall"
fi
-LIBS="$LIBS $DEPS_LIBS"
-CFLAGS="$CFLAGS $DEPS_CFLAGS"
+LIBS="$LIBS $DEPS_LIBS $LIBXOSD_LIBS"
+CFLAGS="$CFLAGS $DEPS_CFLAGS $LIBXOSD_CLFAGS"
AC_SUBST(LIBS)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
2007-06-14 07:19:03 UTC (rev 2245)
@@ -2,6 +2,7 @@
moko-ui.h \
moko-alignment.h \
moko-application.h \
+ moko-banner.h \
moko-details-window.h \
moko-dialog-window.h \
moko-finger-tool-box.h \
@@ -24,6 +25,7 @@
source_c = \
moko-alignment.c \
moko-application.c \
+ moko-banner.c \
moko-details-window.c \
moko-dialog-window.c \
moko-finger-tool-box.c \
@@ -53,7 +55,7 @@
lib_LTLIBRARIES = libmokoui.la
libmokoui_la_SOURCES = $(source_c) $(source_h)
libmokoui_la_LIBADD =
-libmokoui_la_LDFLAGS = -version-info 0:1:0
+libmokoui_la_LDFLAGS = -version-info 0:2:0
libopenmokouiheadersdir = $(includedir)/openmoko-libs/libmokoui
libopenmokouiheaders_DATA = $(source_h)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-06-14 07:19:03 UTC (rev 2245)
@@ -1,10 +1,11 @@
TEMPLATE = lib
-VERSION = 0.0.3
+VERSION = 0.2.0
TARGET = mokoui
HEADERS = \
moko-alignment.h \
moko-application.h \
+ moko-banner.h \
moko-details-window.h \
moko-dialog.h \
moko-dialog-window.h \
@@ -28,6 +29,7 @@
SOURCES = \
moko-alignment.c \
moko-application.c \
+ moko-banner.c \
moko-details-window.c \
moko-dialog.c \
moko-dialog-window.c \
@@ -48,5 +50,7 @@
moko-window.c
PKGCONFIG += gtk+-2.0
+QMAKE_CFLAGS += `xosd-config --cflags`
+LIBS += `xosd-config --libs`
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
2007-06-14 06:21:41 UTC (rev 2244)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
2007-06-14 07:19:03 UTC (rev 2245)
@@ -113,11 +113,6 @@
priv->icon_factory = gtk_icon_factory_new();
gtk_icon_factory_add_default( priv->icon_factory );
-#if 0
- moko_application_add_stock_icons( self,
- "openmoko-default-application",
- NULL );
-#endif
priv->windows = NULL;
priv->is_topmost = FALSE;
priv->window_group =
GDK_WINDOW_XID(gdk_display_get_default_group(gdk_display_get_default()));
@@ -127,7 +122,7 @@
priv->net_active_window_atom = XInternAtom( GDK_DISPLAY(),
"_NET_ACTIVE_WINDOW", False );
priv->seen_matchbox_atom = FALSE;
- moko_stock_register ();
+ moko_stock_register();
}
static void moko_application_finalize (GObject *self)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 09:21:02 +0200 (Thu, 14 Jun 2007)
New Revision: 2246
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
Log:
update
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-14 07:19:03 UTC
(rev 2245)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-14 07:21:02 UTC
(rev 2246)
@@ -1,3 +1,12 @@
+2007-06-14 Mickey <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * libmokoui/Makefile.in:
+ * libmokoui/banner.c:
+ * libmokoui/banner.h:
+
+ Add MokoBanner as on-screen display
+
2007-06-12 Thomas <[EMAIL PROTECTED]>
* libmokoui/moko-stock.c:
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 09:35:53 +0200 (Thu, 14 Jun 2007)
New Revision: 2247
Added:
trunk/oe/packages/libxosd/
trunk/oe/packages/libxosd/libxosd_2.2.15.bb
Log:
oe: add libxosd
Added: trunk/oe/packages/libxosd/libxosd_2.2.15.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_2.2.15.bb 2007-06-14 07:21:02 UTC (rev
2246)
+++ trunk/oe/packages/libxosd/libxosd_2.2.15.bb 2007-06-14 07:35:53 UTC (rev
2247)
@@ -0,0 +1,15 @@
+DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
+SECTION = "libs/x11"
+DEPENDS = "virtual/libx11 libxext"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI =
"svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=${PV};proto=https"
+S = "${WORKDIR}/${PV}"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 09:36:32 +0200 (Thu, 14 Jun 2007)
New Revision: 2248
Modified:
trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb
Log:
oe/openmoko-base: depend on libxosd
Modified: trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb 2007-06-14
07:35:53 UTC (rev 2247)
+++ trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb 2007-06-14
07:36:32 UTC (rev 2248)
@@ -3,9 +3,9 @@
based on Gtk+ 2.x"
SECTION = "openmoko/libs"
LICENSE = "LGPL"
-DEPENDS += "gtk+ eds-dbus libgsmd"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r4"
+DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
+PV = "0.4.0+svn${SRCDATE}"
+PR = "r0"
inherit openmoko
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 09:50:20 +0200 (Thu, 14 Jun 2007)
New Revision: 2249
Added:
trunk/oe/packages/libxosd/libxosd_2.2.14.bb
Log:
oe: add libxosd 2.2.14 as well
Added: trunk/oe/packages/libxosd/libxosd_2.2.14.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_2.2.14.bb 2007-06-14 07:36:32 UTC (rev
2248)
+++ trunk/oe/packages/libxosd/libxosd_2.2.14.bb 2007-06-14 07:50:20 UTC (rev
2249)
@@ -0,0 +1,14 @@
+DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
+SECTION = "libs/x11"
+DEPENDS = "virtual/libx11 libxext"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libxosd/libxosd-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 10:21:35 +0200 (Thu, 14 Jun 2007)
New Revision: 2250
Added:
trunk/oe/packages/libxosd/files/
trunk/oe/packages/libxosd/files/autofoo.patch
trunk/oe/packages/libxosd/libxosd_svn.bb
Removed:
trunk/oe/packages/libxosd/libxosd_2.2.14.bb
trunk/oe/packages/libxosd/libxosd_2.2.15.bb
Log:
oe/libxosd: remove fixed versions, add svn version, remove unused autofoo stuff
Added: trunk/oe/packages/libxosd/files/autofoo.patch
===================================================================
--- trunk/oe/packages/libxosd/files/autofoo.patch 2007-06-14 07:50:20 UTC
(rev 2249)
+++ trunk/oe/packages/libxosd/files/autofoo.patch 2007-06-14 08:21:35 UTC
(rev 2250)
@@ -0,0 +1,116 @@
+Index: current/configure.ac
+===================================================================
+--- current.orig/configure.ac 2007-06-14 09:06:04.000000000 +0000
++++ current/configure.ac 2007-06-14 09:14:37.000000000 +0000
+@@ -52,8 +52,6 @@
+ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
+
+ dnl Checks for libraries.
+-AM_PATH_GTK(1.2.2,,
+- AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
+ AC_CHECK_LIB(X11, XInitThreads,,
+ AC_MSG_ERROR([*** X11 not threadsafe ***]))
+ AC_CHECK_LIB(Xext, XShapeQueryExtension,,
+@@ -107,63 +105,6 @@
+ AC_MSG_WARN("beep media player not found")
+ fi
+
+-dnl Check for xmms
+-AM_PATH_XMMS(1.2.7,,
+- AC_MSG_WARN("xmms plugins can not be built"))
+-dnl Override where to place libxmms_xosd.so
+-AC_ARG_WITH([plugindir],
+- AC_HELP_STRING([--with-plugindir=DIR],
+- [Set the xmms plugin directory]),
+- [XMMS_PLUGIN_DIR="$withval"],
+- [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
+-
+-dnl Check for gdk-pixbuf
+-AM_PATH_GDK_PIXBUF(0.22.0,,
+- AC_MSG_WARN("new xmms plugin can not be built"))
+-dnl Override where to place pixmaps for libxmms_xosd.so
+-AC_ARG_WITH([pixmapdir],
+- AC_HELP_STRING([--with-pixmapdir=DIR],
+- [Set the directory for xmms plugin pixmaps]),
+- [XMMS_PIXMAPDIR="$withval"],
+- [XMMS_PIXMAPDIR="${datadir}/xosd"])
+-AC_SUBST(XMMS_PIXMAPDIR)
+-
+-dnl NEW plugin
+-AC_ARG_ENABLE([new-plugin],
+- AC_HELP_STRING([--disable-new-plugin],
+- [Disable new xmms plugin (enabled by default)]),
+- [enable_new_plugin="$enableval"],
+- [enable_new_plugin="yes"])
+-AC_MSG_CHECKING([whether new xmms plugin was requested])
+-AC_MSG_RESULT($enable_new_plugin)
+-AM_CONDITIONAL([BUILD_NEW_PLUGIN],
+- [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a
x"$no_gdk_pixbuf" != "xyes"])
+-
+-
+-dnl Check for Beep Media player
+-AC_ARG_ENABLE([beep_media_player_plugin],
+- AC_HELP_STRING([--enable-beep_media_player_plugin],
+- [Enable beep media plugin (enabled by default)]),
+- [beep_media_player_plugin="$enableval"],
+- [beep_media_player_plugin="yes"])
+-AC_MSG_CHECKING([whether beep media plugin was requested])
+-AC_MSG_RESULT($beep_media_player_plugin)
+-
+-AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
+- [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" ==
"xyes"])
+-
+-dnl OLD plugin
+-AC_ARG_ENABLE([old-plugin],
+- AC_HELP_STRING([--enable-old-plugin],
+- [Enable old xmms plugin (disabled by default)]),
+- [enable_old_plugin="$enableval"],
+- [enable_old_plugin="no"])
+-AC_MSG_CHECKING([whether old xmms plugin was requested])
+-AC_MSG_RESULT($enable_old_plugin)
+-AM_CONDITIONAL([BUILD_OLD_PLUGIN],
+- [test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])
+-
+-
+ dnl Define XOSD_VERSION
+ AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")
+
+@@ -174,8 +115,6 @@
+ Makefile
+ src/Makefile
+ src/libxosd/Makefile
+-src/xmms_plugin/Makefile
+-src/bmp_plugin/Makefile
+ macros/Makefile
+ man/Makefile
+ pixmaps/Makefile
+Index: current/src/Makefile.am
+===================================================================
+--- current.orig/src/Makefile.am 2007-06-14 09:06:04.000000000 +0000
++++ current/src/Makefile.am 2007-06-14 09:14:37.000000000 +0000
+@@ -10,6 +10,4 @@
+
+ include_HEADERS = xosd.h
+
+-AM_CFLAGS = ${GTK_CFLAGS}
+-
+-SUBDIRS=libxosd xmms_plugin bmp_plugin
++SUBDIRS=libxosd
+Index: current/Makefile.am
+===================================================================
+--- current.orig/Makefile.am 2007-06-14 09:06:04.000000000 +0000
++++ current/Makefile.am 2007-06-14 09:16:15.000000000 +0000
+@@ -1,11 +1,5 @@
+-if BUILD_NEW_PLUGIN
+- NEW_SUB = pixmaps
+-endif
+-if BUILD_BEEP_MEDIA_PLUGIN
+- NEW_SUB = pixmaps
+-endif
+-SUBDIRS = macros man $(NEW_SUB) src script
+-DIST_SUBDIRS = macros man pixmaps src script
++SUBDIRS = macros man src script
++DIST_SUBDIRS = macros man src script
+
+ DISTCLEANFILES = libtool-disable-static
+
Deleted: trunk/oe/packages/libxosd/libxosd_2.2.14.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_2.2.14.bb 2007-06-14 07:50:20 UTC (rev
2249)
+++ trunk/oe/packages/libxosd/libxosd_2.2.14.bb 2007-06-14 08:21:35 UTC (rev
2250)
@@ -1,14 +0,0 @@
-DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
-SECTION = "libs/x11"
-DEPENDS = "virtual/libx11 libxext"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libxosd/libxosd-${PV}.tar.gz"
-
-inherit autotools binconfig
-
-do_stage() {
- autotools_stage_all
-}
-
Deleted: trunk/oe/packages/libxosd/libxosd_2.2.15.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_2.2.15.bb 2007-06-14 07:50:20 UTC (rev
2249)
+++ trunk/oe/packages/libxosd/libxosd_2.2.15.bb 2007-06-14 08:21:35 UTC (rev
2250)
@@ -1,15 +0,0 @@
-DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
-SECTION = "libs/x11"
-DEPENDS = "virtual/libx11 libxext"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI =
"svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=${PV};proto=https"
-S = "${WORKDIR}/${PV}"
-
-inherit autotools binconfig
-
-do_stage() {
- autotools_stage_all
-}
-
Added: trunk/oe/packages/libxosd/libxosd_svn.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_svn.bb 2007-06-14 07:50:20 UTC (rev
2249)
+++ trunk/oe/packages/libxosd/libxosd_svn.bb 2007-06-14 08:21:35 UTC (rev
2250)
@@ -0,0 +1,20 @@
+DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
+SECTION = "libs/x11"
+DEPENDS = "virtual/libx11 libxext"
+LICENSE = "GPL"
+PV = "2.2.15+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI =
"svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https
\
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/current"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}"
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 10:33:10 +0200 (Thu, 14 Jun 2007)
New Revision: 2251
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe/task-openmoko: add bridge utils as per MH request
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-14 08:21:35 UTC (rev
2250)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-14 08:33:10 UTC (rev
2251)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r42"
+PR = "r43"
PACKAGES = "\
task-openmoko-linux \
@@ -147,6 +147,7 @@
DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
RDEPENDS_task-openmoko-net = "\
bluez-utils \
+ bridge-utils \
"
#
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-14 10:35:04 +0200 (Thu, 14 Jun 2007)
New Revision: 2252
Modified:
trunk/oe/packages/libxosd/libxosd_svn.bb
Log:
oe/libxosd: fix license (has been relicensed recently) to LGPL
Modified: trunk/oe/packages/libxosd/libxosd_svn.bb
===================================================================
--- trunk/oe/packages/libxosd/libxosd_svn.bb 2007-06-14 08:33:10 UTC (rev
2251)
+++ trunk/oe/packages/libxosd/libxosd_svn.bb 2007-06-14 08:35:04 UTC (rev
2252)
@@ -1,7 +1,7 @@
DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
SECTION = "libs/x11"
DEPENDS = "virtual/libx11 libxext"
-LICENSE = "GPL"
+LICENSE = "LGPL"
PV = "2.2.15+svn${SRCDATE}"
PR = "r0"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
