[oe-commits] org.oe.dev merge of 'a17b5ac6bf09c1cfe29c784e2b1497684e1832ca'
thebohemian commit
oe at amethyst.openembedded.net
Mon Sep 1 18:13:46 UTC 2008
merge of 'a17b5ac6bf09c1cfe29c784e2b1497684e1832ca'
and 'b1c5c4bee3ccfe87f1e42ab909186c7db359dd0e'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: fcf6ab426e7b2e6db43f6581a7c5a7602043b9e3
ViewMTN: http://monotone.openembedded.org/revision/info/fcf6ab426e7b2e6db43f6581a7c5a7602043b9e3
Files:
1
packages/dbus-java/dbus-java_2.5.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
packages/directfb/fusionsound_1.0.0.bb
packages/python/python-pygame-1.7.1
packages/python/python-pygame-1.7.1/Setup
packages/python/python-pygame_1.7.1.bb
packages/directfb/fusionsound-1.1.0+git20070709
packages/python/python-pygame-1.8.1
packages/sugar
packages/sysstat
packages/directfb/files/use_limits_h.patch
packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch
packages/gnash/files/libintl.patch
packages/python/python-pygame-1.8.1/Setup
packages/python/python-pygame_1.8.1.bb
packages/sugar/sugar-toolkit_0.82.1.bb
packages/sugar/sugar_0.82.0.bb
packages/sysstat/sysstat_8.1.5.bb
packages/directfb/fusionsound_1.1.0+git20070709.bb
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/gettext/gettext_0.17.bb
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
packages/images/fso-image.bb
packages/tasks/task-openmoko-feed.bb
Diffs:
#
# mt diff -ra17b5ac6bf09c1cfe29c784e2b1497684e1832ca -rfcf6ab426e7b2e6db43f6581a7c5a7602043b9e3
#
#
#
# add_file "packages/dbus-java/dbus-java_2.5.bb"
# content [086dc07a09255825ba9edd8b9bab5b2df169cc09]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [575d1bce4f960e8739b07964559e58e5768379d1]
# to [061fae181a63b2fd115413ac49ae154b1e460c30]
#
# patch "packages/dbus-java/dbus-java_2.4.bb"
# from [3be815bf6755338045753a524ff10c510c2494e9]
# to [3f5fc4bd6d7ad822cbce130de00dc47d49b71806]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
# to [71010dc2c983fe59f78867b3ee655ce1f89d7baa]
#
# patch "packages/openjade/openjade_1.3.2.bb"
# from [76bc945ead3da7d2228e8c419c0a3fa3f1fd193e]
# to [d3a31831d26d84480a79570ca2fb3c0d309d1459]
#
============================================================
--- packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
+++ packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+ oe_runmake \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ bin
+
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ bin
+
+ # Generate man pages.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ man
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 575d1bce4f960e8739b07964559e58e5768379d1
+++ packages/dbus-java/dbus-java_2.3.bb 061fae181a63b2fd115413ac49ae154b1e460c30
@@ -20,10 +20,15 @@ RDEPENDS_dbus-java-bin = "java2-runtime
RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -32,7 +37,7 @@ do_compile () {
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
============================================================
--- packages/dbus-java/dbus-java_2.4.bb 3be815bf6755338045753a524ff10c510c2494e9
+++ packages/dbus-java/dbus-java_2.4.bb 3f5fc4bd6d7ad822cbce130de00dc47d49b71806
@@ -17,10 +17,15 @@ inherit java-library
inherit java-library
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -28,7 +33,7 @@ do_compile () {
JAR="fastjar" \
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
============================================================
--- packages/openjade/openjade-native_1.3.2.bb fe4d7272d3a91055775804bedf2ab7af3fcc45f2
+++ packages/openjade/openjade-native_1.3.2.bb 71010dc2c983fe59f78867b3ee655ce1f89d7baa
@@ -15,9 +15,13 @@ EXTRA_OECONF = "--enable-spincludedir=${
--enable-splibdir=${STAGING_LIBDIR} \
--enable-default-catalog=${sysconfdir}/sgml/catalog \
--enable-default-search-path=${datadir}/sgml"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
+
do_configure () {
mv config/configure.in .
gnu-configize
============================================================
--- packages/openjade/openjade_1.3.2.bb 76bc945ead3da7d2228e8c419c0a3fa3f1fd193e
+++ packages/openjade/openjade_1.3.2.bb d3a31831d26d84480a79570ca2fb3c0d309d1459
@@ -12,9 +12,13 @@ EXTRA_OECONF = "--enable-spincludedir=${
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
+
do_configure_prepend () {
mv config/configure.in .
}
#
# mt diff -rb1c5c4bee3ccfe87f1e42ab909186c7db359dd0e -rfcf6ab426e7b2e6db43f6581a7c5a7602043b9e3
#
#
#
# delete "packages/directfb/fusionsound_1.0.0.bb"
#
# delete "packages/python/python-pygame-1.7.1"
#
# delete "packages/python/python-pygame-1.7.1/Setup"
#
# delete "packages/python/python-pygame_1.7.1.bb"
#
# add_dir "packages/directfb/fusionsound-1.1.0+git20070709"
#
# add_dir "packages/python/python-pygame-1.8.1"
#
# add_dir "packages/sugar"
#
# add_dir "packages/sysstat"
#
# add_file "packages/directfb/files/use_limits_h.patch"
# content [ad7213eaf205fc699b1798b82ad23c028f0d7cb1]
#
# add_file "packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch"
# content [52481ed544f51f5309bdad048543bcb195122776]
#
# add_file "packages/gnash/files/libintl.patch"
# content [8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9]
#
# add_file "packages/python/python-pygame-1.8.1/Setup"
# content [afc5f4e23585b9e72e86fe289aef63f316f8fa37]
#
# add_file "packages/python/python-pygame_1.8.1.bb"
# content [d20237c5870066d97af5c40249900e87c039beda]
#
# add_file "packages/sugar/sugar-toolkit_0.82.1.bb"
# content [26cbe65d86d7a8971743b26419af876eafaea7ef]
#
# add_file "packages/sugar/sugar_0.82.0.bb"
# content [a186f451e2c19db6fa16f473692cff2eafea42de]
#
# add_file "packages/sysstat/sysstat_8.1.5.bb"
# content [0dad3525c7cdc27d60bff198bc7631736117ea7d]
#
# patch "packages/directfb/fusionsound_1.1.0+git20070709.bb"
# from [7997d441ffb5381b5208cba5b8a72377fe2fd011]
# to [06e72ecc44e8eeef034076c89172d6c2b6f47edc]
#
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
# from [3b404c6f9bbe799efebf5c54853e2ef3acc160dd]
# to [aaa2ede39c269671da1b463d943cda006ff393cf]
#
# patch "packages/gettext/gettext_0.17.bb"
# from [d39e7c39ab4154e36e9937b5f173e7652e401999]
# to [089d02dc9fa1adf968040048a2f64700470abe3a]
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
# from [6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2]
# to [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
#
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
# from [6396b4820385850e505d3bf5e1590f4dac5ff6b6]
# to [36448f84bc62c99b5090bf2b25d855cc753f82a3]
#
# patch "packages/gnash/gnash-minimal_cvs.bb"
# from [62f9652b7093e6633562fd3ed356c137c7dba781]
# to [db4c2629fdbc1291308a0a48419a39a584264d1d]
#
# patch "packages/images/fso-image.bb"
# from [c1ef8880079b495bdb218a51113abbbd36449724]
# to [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [b70d0fc4a17c8e55bd27e714099e1cca24735777]
# to [baa4e904acab8916566bec7f5b14359d063354e9]
#
============================================================
--- packages/directfb/files/use_limits_h.patch ad7213eaf205fc699b1798b82ad23c028f0d7cb1
+++ packages/directfb/files/use_limits_h.patch ad7213eaf205fc699b1798b82ad23c028f0d7cb1
@@ -0,0 +1,10 @@
+--- FusionSound-1.0.0.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c
++++ FusionSound-1.0.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c
+@@ -109,6 +109,7 @@ typedef struct {
+
+ #if defined(__linux__)
+
++#include <limits.h>
+ #include <linux/cdrom.h>
+
+ static DFBResult
============================================================
--- packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch 52481ed544f51f5309bdad048543bcb195122776
+++ packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch 52481ed544f51f5309bdad048543bcb195122776
@@ -0,0 +1,23 @@
+--- git/fusionsound.pc.in~org 2008-08-19 11:04:27.000000000 -0400
++++ git/fusionsound.pc.in 2008-08-19 11:06:20.000000000 -0400
+@@ -8,4 +8,4 @@
+ Description: Multi application sound streaming and mixing
+ Version: @VERSION@
+ Libs: -L${libdir} -lfusionsound
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/fusionsound
+--- git/fusionsound-internal.pc.in~org 2008-08-19 11:11:57.000000000 -0400
++++ git/fusionsound-internal.pc.in 2008-08-19 11:08:31.000000000 -0400
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+
+ Name: FusionSound-Internal
+ Description: Third party module support package for FusionSound.
+ Version: @VERSION@
+ Requires: fusionsound = @VERSION@
+-Cflags: -I at INTERNALINCLUDEDIR@
++Cflags: -I${includedir}/fusionsound -I${includedir}
============================================================
--- packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
+++ packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
@@ -0,0 +1,13 @@
+Index: gnash-0.8.3/gui/am-frag/fb.am
+===================================================================
+--- gnash-0.8.3.orig/gui/am-frag/fb.am 2008-08-19 00:37:45.000000000 +0200
++++ gnash-0.8.3/gui/am-frag/fb.am 2008-08-19 00:38:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+ fb_gnash_SOURCES +=
+ fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+- $(GNASH_LIBS) $(AGG_LIBS)
++ $(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS)
+ endif # BUILD_AGG_RENDERER
+ endif # BUILD_FB_GUI
+
============================================================
--- packages/python/python-pygame-1.8.1/Setup afc5f4e23585b9e72e86fe289aef63f316f8fa37
+++ packages/python/python-pygame-1.8.1/Setup afc5f4e23585b9e72e86fe289aef63f316f8fa37
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
+#build a correct Setup file for you based on your system settings.
+#If not, the format is simple enough to edit by hand. First change
+#the needed commandline flags for each dependency, then comment out
+#any unavailable optional modules in the first optional section.
+
+
+SDL = -D_REENTRANT -Xlinker -lSDL -lpthread
+FONT = -lSDL_ttf
+IMAGE = -lSDL_image
+MIXER = -lSDL_mixer
+SMPEG = -lsmpeg
+PNG = -lpng
+JPEG = ljpeg
+SCRAP = -lX11
+
+#DEBUG = -C-W -C-Wall
+DEBUG =
+
+#the following modules are optional. you will want to compile
+#everything you can, but you can ignore ones you don't have
+#dependencies for, just comment them out
+
+imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
+_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+
+#experimental new movie movie. requires libavcodec and libavformat.
+#add any necessary compile flags to this line and uncomment.
+#movieext src/movie.c src/ffmovie.c $(SDL) -lavcodec -lavformat
+
+
+#these modules are required for pygame to run. they only require
+#SDL as a dependency. these should not be altered
+
+base src/base.c $(SDL) $(DEBUG)
+cdrom src/cdrom.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+overlay src/overlay.c $(SDL) $(DEBUG)
+transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+
============================================================
--- packages/python/python-pygame_1.8.1.bb d20237c5870066d97af5c40249900e87c039beda
+++ packages/python/python-pygame_1.8.1.bb d20237c5870066d97af5c40249900e87c039beda
@@ -0,0 +1,26 @@
+DESCRIPTION = "Python libSDL Bindings"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.pygame.org"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
+SRCNAME = "pygame"
+PR = "ml0"
+
+SRC_URI = "\
+ ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \
+ file://Setup"
+S = "${WORKDIR}/${SRCNAME}-${PV}release"
+
+inherit distutils
+
+do_configure_prepend() {
+ cat ${WORKDIR}/Setup >Setup
+ SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
+}
+
+do_stage() {
+ distutils_stage_all
+}
+
+RDEPENDS = "python-numeric"
============================================================
--- packages/sugar/sugar-toolkit_0.82.1.bb 26cbe65d86d7a8971743b26419af876eafaea7ef
+++ packages/sugar/sugar-toolkit_0.82.1.bb 26cbe65d86d7a8971743b26419af876eafaea7ef
@@ -0,0 +1,15 @@
+DESCRIPTION = "Sugar toolkit"
+LICENSE = "LGPLv2"
+
+DEPENDS = "libxml2 gtk+"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/sugar/sugar_0.82.0.bb a186f451e2c19db6fa16f473692cff2eafea42de
+++ packages/sugar/sugar_0.82.0.bb a186f451e2c19db6fa16f473692cff2eafea42de
@@ -0,0 +1,25 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar-toolkit libxml2 gtk+"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+ mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+ ${datadir}/mime \
+ ${datadir}/xsessions \
+ ${datadir}/dbus-1 \
+ ${sysconfdir} "
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/sysstat/sysstat_8.1.5.bb 0dad3525c7cdc27d60bff198bc7631736117ea7d
+++ packages/sysstat/sysstat_8.1.5.bb 0dad3525c7cdc27d60bff198bc7631736117ea7d
@@ -0,0 +1,15 @@
+DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
+HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz"
+
+inherit autotools
+
+do_configure_prepend() {
+ sed -i s,'-g $(MAN_GROUP)','', Makefile.in
+}
+
+FILES_${PN} += "${libdir}/sa"
+
============================================================
--- packages/directfb/fusionsound_1.1.0+git20070709.bb 7997d441ffb5381b5208cba5b8a72377fe2fd011
+++ packages/directfb/fusionsound_1.1.0+git20070709.bb 06e72ecc44e8eeef034076c89172d6c2b6f47edc
@@ -2,9 +2,11 @@ LICENSE = "LGPL"
DEPENDS = "directfb"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r0"
+PR = "r2"
SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \
+ file://fix-pkgconfig-cflags.patch;patch=1 \
+ file://use_limits_h.patch;patch=1 \
"
S = "${WORKDIR}/git"
============================================================
--- packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf 3b404c6f9bbe799efebf5c54853e2ef3acc160dd
+++ packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf aaa2ede39c269671da1b463d943cda006ff393cf
@@ -11,5 +11,10 @@ modemtype = ti_calypso
# GTA01 has TI Calypso
modemtype = ti_calypso
+[ogpsd]
+device = NMEADevice
+channel = UDPChannel
+path = 6000
+
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
============================================================
--- packages/gettext/gettext_0.17.bb d39e7c39ab4154e36e9937b5f173e7652e401999
+++ packages/gettext/gettext_0.17.bb 089d02dc9fa1adf968040048a2f64700470abe3a
@@ -2,9 +2,9 @@ LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "virtual/libiconv"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
PROVIDES = "virtual/libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -15,12 +15,6 @@ SRC_URI_append_linux-uclibcgnueabi = " f
SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
-#gettext.class cant be inherit here so use this hack same as in libiconv
-DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-
PARALLEL_MAKE = ""
inherit autotools
@@ -34,6 +28,7 @@ EXTRA_OECONF += "--without-lispdir \
--with-included-glib \
--without-emacs \
"
+
acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-I ${S}/gettext-runtime/m4 \
-I ${S}/gettext-tools/m4'
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb 6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2
+++ packages/gnash/gnash-minimal_0.8.2.bb c0be1ee88262033c9d6942a9e663cd67fd8f9cf0
@@ -1,2 +1,3 @@ require gnash-minimal.inc
require gnash-minimal.inc
+PR = "r1"
============================================================
--- packages/gnash/gnash-minimal_0.8.3.bb 6396b4820385850e505d3bf5e1590f4dac5ff6b6
+++ packages/gnash/gnash-minimal_0.8.3.bb 36448f84bc62c99b5090bf2b25d855cc753f82a3
@@ -1,12 +1,12 @@ require gnash-minimal.inc
require gnash-minimal.inc
-PR = "r6"
+PR = "r7"
EXTRA_OECONF += " --without-included-ltdl \
--with-ltdl-include=${STAGING_INCDIR} \
--with-ltdl-lib=${STAGING_LIBDIR} \
"
-SRC_URI += "file://libtool-2.2.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
============================================================
--- packages/gnash/gnash-minimal_cvs.bb 62f9652b7093e6633562fd3ed356c137c7dba781
+++ packages/gnash/gnash-minimal_cvs.bb db4c2629fdbc1291308a0a48419a39a584264d1d
@@ -1,6 +1,6 @@ require gnash-minimal.inc
require gnash-minimal.inc
-PV = "0.8.2+cvs${SRCDATE}"
+PV = "0.8.3+cvs${SRCDATE}"
SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
S = ${WORKDIR}/gnash
============================================================
--- packages/images/fso-image.bb c1ef8880079b495bdb218a51113abbbd36449724
+++ packages/images/fso-image.bb c8a13bba7a46ab4c7fb795f650086b0a34e45787
@@ -50,6 +50,7 @@ TOOLS_INSTALL = "\
nano \
powertop \
s3c24xx-gpio \
+ sysstat \
"
# audio
============================================================
--- packages/tasks/task-openmoko-feed.bb b70d0fc4a17c8e55bd27e714099e1cca24735777
+++ packages/tasks/task-openmoko-feed.bb baa4e904acab8916566bec7f5b14359d063354e9
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r31"
+PR = "r33"
inherit task
@@ -85,4 +85,8 @@ RDEPENDS_task-openmoko-feed = "\
libnotify \
notification-daemon \
u-boot-openmoko \
+ libxine \
+# subversion \
+ task-openmoko-games \
+ xournal \
"
More information about the Openembedded-commits
mailing list