[oe-commits] org.oe.dev merge of 'c05229a8c5246cada336c3cfe5a3417367366836'
mickeyl commit
oe at amethyst.openembedded.net
Mon Sep 1 18:13:24 UTC 2008
merge of 'c05229a8c5246cada336c3cfe5a3417367366836'
and 'ef9cb35b2ec71124443e3492f55fe842c40ba66e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 355866fda3e7098f7d30f22852c4e3ad5145126b
ViewMTN: http://monotone.openembedded.org/revision/info/355866fda3e7098f7d30f22852c4e3ad5145126b
Files:
1
packages/python/python-pygame-1.7.1
packages/python/python-pygame-1.7.1/Setup
packages/python/python-pygame_1.7.1.bb
packages/python/python-pygame-1.8.1
packages/sysstat
packages/python/python-pygame-1.8.1/Setup
packages/python/python-pygame_1.8.1.bb
packages/sysstat/sysstat_8.1.5.bb
packages/images/fso-image.bb
packages/directfb/fusionsound_1.0.0.bb
packages/php/php-5.2.5
packages/php/php-5.2.5/acinclude-xml2-config.patch
packages/php/php-5.2.5/pear-makefile.patch
packages/php/php-native_5.2.5.bb
packages/php/php_5.2.5.bb
packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/maemo/hildon-base-lib_0.8.6-2.bb
packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
packages/maemo/hildon-fm_0.9.1-2.bb
packages/nonworking/maemo/hildon-fm_0.9.1-2.bb
packages/maemo/hildon-initscripts
packages/nonworking/maemo/hildon-initscripts
packages/maemo/hildon-initscripts_0.8.14-1.bb
packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
packages/maemo/hildon-lgpl
packages/nonworking/maemo/hildon-lgpl
packages/maemo/hildon-lgpl_0.9.14-2.bb
packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
packages/maemo/hildon-libs
packages/nonworking/maemo/hildon-libs
packages/maemo/hildon-libs_0.9.6-2.bb
packages/nonworking/maemo/hildon-libs_0.9.6-2.bb
packages/maemo/hildon-navigator
packages/nonworking/maemo/hildon-navigator
packages/maemo/hildon-navigator_0.9.6-2.bb
packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb
packages/maemo/osso-screenshot-tool_1.20-1.bb
packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb
packages/maemo/osso-thumbnail_0.3.1-1.bb
packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb
packages/maemo/sapwood
packages/nonworking/maemo/sapwood
packages/maemo/sapwood_1.20-1.bb
packages/nonworking/maemo/sapwood_1.20-1.bb
packages/directfb/fusionsound-1.1.0+git20070709
packages/nonworking/gpe-contacts
packages/php/php-5.2.6
packages/directfb/files/use_limits_h.patch
packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch
packages/gnash/files/libintl.patch
packages/php/php-native_5.2.6.bb
packages/php/php_5.2.6.bb
conf/distro/include/sane-srcrevs.inc
packages/directfb/fusionsound_1.1.0+git20070709.bb
packages/efl1/imlib2_cvs.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/illume-theme-freesmartphone_git.bb
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/phoneme/phoneme-advanced.inc
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-slugos.bb
packages/telepathy/telepathy-python_0.14.0.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
Diffs:
#
# mt diff -rc05229a8c5246cada336c3cfe5a3417367366836 -r355866fda3e7098f7d30f22852c4e3ad5145126b
#
#
#
# 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/python/python-pygame-1.8.1"
#
# add_dir "packages/sysstat"
#
# 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/sysstat/sysstat_8.1.5.bb"
# content [0dad3525c7cdc27d60bff198bc7631736117ea7d]
#
# patch "packages/images/fso-image.bb"
# from [c1ef8880079b495bdb218a51113abbbd36449724]
# to [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
#
============================================================
--- 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/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/images/fso-image.bb c1ef8880079b495bdb218a51113abbbd36449724
+++ packages/images/fso-image.bb c8a13bba7a46ab4c7fb795f650086b0a34e45787
@@ -50,6 +50,7 @@ TOOLS_INSTALL = "\
nano \
powertop \
s3c24xx-gpio \
+ sysstat \
"
# audio
#
# mt diff -ref9cb35b2ec71124443e3492f55fe842c40ba66e -r355866fda3e7098f7d30f22852c4e3ad5145126b
#
#
#
# delete "packages/directfb/fusionsound_1.0.0.bb"
#
# delete "packages/php/php-5.2.5"
#
# delete "packages/php/php-5.2.5/acinclude-xml2-config.patch"
#
# delete "packages/php/php-5.2.5/pear-makefile.patch"
#
# delete "packages/php/php-native_5.2.5.bb"
#
# delete "packages/php/php_5.2.5.bb"
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.40.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb"
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.42.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb"
#
# rename "packages/maemo/hildon-base-lib_0.8.6-2.bb"
# to "packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb"
#
# rename "packages/maemo/hildon-fm_0.9.1-2.bb"
# to "packages/nonworking/maemo/hildon-fm_0.9.1-2.bb"
#
# rename "packages/maemo/hildon-initscripts"
# to "packages/nonworking/maemo/hildon-initscripts"
#
# rename "packages/maemo/hildon-initscripts_0.8.14-1.bb"
# to "packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb"
#
# rename "packages/maemo/hildon-lgpl"
# to "packages/nonworking/maemo/hildon-lgpl"
#
# rename "packages/maemo/hildon-lgpl_0.9.14-2.bb"
# to "packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb"
#
# rename "packages/maemo/hildon-libs"
# to "packages/nonworking/maemo/hildon-libs"
#
# rename "packages/maemo/hildon-libs_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-libs_0.9.6-2.bb"
#
# rename "packages/maemo/hildon-navigator"
# to "packages/nonworking/maemo/hildon-navigator"
#
# rename "packages/maemo/hildon-navigator_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb"
#
# rename "packages/maemo/osso-screenshot-tool_1.20-1.bb"
# to "packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb"
#
# rename "packages/maemo/osso-thumbnail_0.3.1-1.bb"
# to "packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb"
#
# rename "packages/maemo/sapwood"
# to "packages/nonworking/maemo/sapwood"
#
# rename "packages/maemo/sapwood_1.20-1.bb"
# to "packages/nonworking/maemo/sapwood_1.20-1.bb"
#
# add_dir "packages/directfb/fusionsound-1.1.0+git20070709"
#
# add_dir "packages/nonworking/gpe-contacts"
#
# add_dir "packages/php/php-5.2.6"
#
# 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/php/php-native_5.2.6.bb"
# content [7ad77f6960d21553a40bedf8eb69c089e7854926]
#
# add_file "packages/php/php_5.2.6.bb"
# content [9501f7680f16ff5a3836d55805d466d0389186c1]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [cf047c3c8c3891be3a3ebe03a25ca6e2f491fb49]
# to [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
#
# patch "packages/directfb/fusionsound_1.1.0+git20070709.bb"
# from [7997d441ffb5381b5208cba5b8a72377fe2fd011]
# to [06e72ecc44e8eeef034076c89172d6c2b6f47edc]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [c32847438359b0993cb9eadcf6f4b6019585f54c]
# to [c526c87f355a9b89f816e20b1a5592773eb70178]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [793a30383983a318ac57259d83df5926de1aa01b]
# to [3dbc091185870b33314c866b8ab9802f88af1c32]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [3c8cfda704e6a539e468453e2b038c001d05a9d3]
# to [490cc47f155fb1d62f9f852f8eebe2323fae27e1]
#
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
# from [3b404c6f9bbe799efebf5c54853e2ef3acc160dd]
# to [aaa2ede39c269671da1b463d943cda006ff393cf]
#
# patch "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
# from [7d8251f9fa4e5a7357094ef5e02174512e643850]
# to [4e2384d985f0f4aed6d613bd4e69a5509bd23665]
#
# 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/gstreamer/gst-ffmpeg_0.10.4.bb"
# from [31cd5a76daaa2a0ea225ea4270941d6d5ef2aa73]
# to [9ad7b01ede614d0fc142a01b7546007b40441f34]
#
# patch "packages/openmax/libomxil-bellagio_0.9.0.bb"
# from [b1d186c225ca307e729a0086cd6b55dbbb70f5f2]
# to [3fa766b2661c34b5ef2f3ad60eff1fb05eeee2ec]
#
# patch "packages/phoneme/phoneme-advanced.inc"
# from [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
# to [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [7ef80d3236128df7070e50415a62f1b4e280d8d3]
# to [baa4e904acab8916566bec7f5b14359d063354e9]
#
# patch "packages/tasks/task-slugos.bb"
# from [d6b87da4b933dc8e8d279fbe5f97a6c31fd1e8ec]
# to [284471adae95c9090b461c40a1d4215a4545b8cc]
#
# patch "packages/telepathy/telepathy-python_0.14.0.bb"
# from [b72e5e36875b783b40a06c426e30d901358c86a7]
# to [337dc44149aebc1554bcb6e930da136baa207cc1]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [fa97c83984b56db433bad80d69a6a49429af862a]
# to [078fa05fc808e44e42477177038c538bc6fcff9c]
#
============================================================
--- 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/php/php-native_5.2.6.bb 7ad77f6960d21553a40bedf8eb69c089e7854926
+++ packages/php/php-native_5.2.6.bb 7ad77f6960d21553a40bedf8eb69c089e7854926
@@ -0,0 +1,13 @@
+require php_${PV}.bb
+
+SECTION = "console/network"
+DEPENDS = "zlib-native libxml2-native mysql-native"
+PR = "r1"
+
+S = "${WORKDIR}/php-${PV}"
+
+inherit autotools native pkgconfig
+export LIBS=" -lxml2 "
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
+
+FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
============================================================
--- packages/php/php_5.2.6.bb 9501f7680f16ff5a3836d55805d466d0389186c1
+++ packages/php/php_5.2.6.bb 9501f7680f16ff5a3836d55805d466d0389186c1
@@ -0,0 +1,65 @@
+require php.inc
+
+PR = "r1"
+
+SRC_URI += "file://pear-makefile.patch;patch=1 "
+
+export THREADS="pthread"
+export LIBS=" -lpthread "
+
+EXTRA_OECONF = " --without-iconv \
+ --enable-discard-path \
+ --enable-sockets \
+ --enable-memory-limit \
+ --enable-wddx \
+ --enable-embedded-mysqli \
+ --enable-magic-quotes \
+ --with-zlib \
+ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
+ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
+"
+
+EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}"
+
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
+export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"
+export PHP_PEAR_PHP_BIN="/usr/bin/php"
+
+do_configure_append() {
+ find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
+}
+
+PACKAGES = "${PN}-dbg \
+ ${PN}-cli \
+ ${PN}-pear \
+ ${PN}-dev \
+ ${PN} \
+"
+
+
+FILES_${PN}-dbg =+"/usr/bin/.debug"
+
+FILES_${PN}-cli ="/usr/bin/php"
+
+FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \
+ /usr/lib/php/PEAR \
+ /usr/lib/php/PEAR.php \
+ /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \
+ /usr/lib/php/.channels /usr/lib/php/.channels/.alias \
+ /usr/lib/php/.channels\__uri.reg \
+ /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \
+ /usr/lib/php/.registry \
+ /usr/lib/php/Archive/Tar.php \
+ /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \
+ /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \
+ /usr/lib/php/.lock"
+
+FILES_${PN}-dev ="/usr/include/php /usr/include/build \
+ /usr/bin/phpize /usr/bin/php-config"
+
+FILES_${PN} ="/usr/lib/php"
+FILES_${PN} +="/usr/bin"
+
+RDEPENDS_${PN}-pear =${PN}
+RDEPENDS_${PN}-cli =${PN}
+RDEPENDS_${PN}-dev =${PN}
============================================================
--- conf/distro/include/sane-srcrevs.inc cf047c3c8c3891be3a3ebe03a25ca6e2f491fb49
+++ conf/distro/include/sane-srcrevs.inc 647a26cd30973ca6a2a668fa840c7bff50c53ae3
@@ -49,7 +49,7 @@ SRCREV_pn-illume-theme-asu ?= "170"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-illume ?= "170"
SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "0f27c0b52b8dad255349e6c72d590fa787be8c3b"
+SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- 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/efl1/imlib2_cvs.bb c32847438359b0993cb9eadcf6f4b6019585f54c
+++ packages/efl1/imlib2_cvs.bb c526c87f355a9b89f816e20b1a5592773eb70178
@@ -2,6 +2,7 @@ DEPENDS = "freetype libpng jpeg virtual/
LICENSE = "BSD"
# can also depend on tiff34, ungif or gif, z, bz2, id3tag
DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PROVIDES = "virtual/imlib2"
PV = "1.4.1.000+cvs${SRCDATE}"
PR = "r2"
============================================================
--- packages/ffmpeg/ffmpeg_git.bb 793a30383983a318ac57259d83df5926de1aa01b
+++ packages/ffmpeg/ffmpeg_git.bb 3dbc091185870b33314c866b8ab9802f88af1c32
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r25"
+PR = "r26"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -15,7 +15,7 @@ SRCREV = "3692b8de9fae73860be636606cb634
# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "36c4918f7bc8ff6296d38ed0c9a5f1a8785fcd32"
+SRCREV_arm = "a1b91f5e7bf5612ea3a5c63579f220b0af8da1f8"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/ffmpeg/omapfbplay_git.bb 3c8cfda704e6a539e468453e2b038c001d05a9d3
+++ packages/ffmpeg/omapfbplay_git.bb 490cc47f155fb1d62f9f852f8eebe2323fae27e1
@@ -2,7 +2,7 @@ LICENSE = "MIT"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
inherit module-base
============================================================
--- 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/freesmartphone/illume-theme-freesmartphone_git.bb 7d8251f9fa4e5a7357094ef5e02174512e643850
+++ packages/freesmartphone/illume-theme-freesmartphone_git.bb 4e2384d985f0f4aed6d613bd4e69a5509bd23665
@@ -1,8 +1,9 @@ LICENSE = "MIT/BSD"
DESCRIPTION = "Illume theme for the freesmartphone.org project"
HOMEPAGE = "http://illume.projects.openmoko.org/"
LICENSE = "MIT/BSD"
+DEPENDS = "edje-native eet-native"
PV = "0.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
S = "${WORKDIR}/git/illume"
@@ -10,18 +11,27 @@ do_compile() {
do_compile() {
cd illume && ./build.sh && cd ..
cd illume_init && ./build.sh && cd ..
+ cd illume-config
+ eet -e e.cfg config e.src 1
+ eet -e module.battery.cfg config module.battery.src 1
+ eet -e module.illume.cfg config module.illume.src 1
}
do_install() {
install -d ${D}${sysconfdir}/enlightenment
install -d ${D}${datadir}/enlightenment/data/themes/
install -d ${D}${datadir}/enlightenment/data/init/
+ install -d ${D}${datadir}/enlightenment/data/config/fso/
- # Make illume the default profile
- echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+ # Make fso the default profile
+ echo 'E_PROFILE="-profile fso"' > ${D}${sysconfdir}/enlightenment/default_profile
- install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/
- install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+ install -m 0644 ${S}/illume/fso.edj ${D}${datadir}/enlightenment/data/themes/
+ install -m 0644 ${S}/illume%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list