[oe-commits] org.oe.dev merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
john_lee commit
oe at amethyst.openembedded.net
Fri Apr 25 15:38:21 UTC 2008
merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
and 'a6c27719ef581b67631459a7dcb52cea53fc0ccf'
Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: a7621534097b2c1faa20dfa2e511d526282b8f93
ViewMTN: http://monotone.openembedded.org/revision/info/a7621534097b2c1faa20dfa2e511d526282b8f93
Files:
1
packages/gnash/gnash_0.8.2.bb
packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
packages/gtk-webcore/midori_0.0.17.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/gnash/gnash.inc
packages/python/python-pygtk_2.10.4.bb
packages/assassin
packages/diversity
packages/assassin/assassin_svn.bb
packages/openmoko-projects/assassin_svn.bb
packages/diversity/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/diversity/diversity-nav_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/openmoko-projects
packages/openmoko-projects/illume
packages/openmoko-projects/illume/include-path.diff
packages/openmoko-projects/illume_svn.bb
conf/distro/include/sane-srcdates.inc
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
Diffs:
#
# mt diff -r3a2c550685a02d29aea9d584a7fbab44de0f8f32 -ra7621534097b2c1faa20dfa2e511d526282b8f93
#
#
#
# add_file "packages/gnash/gnash_0.8.2.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch"
# content [1a38468d94ec73034c8e40b001e46322f34fd48b]
#
# add_file "packages/gtk-webcore/midori_0.0.17.bb"
# content [91913de32cf7b037f663c05eaf6700983c2818e1]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [7f74b3f6c95f6b50d191cec8f892ed782b183e7b]
# to [3e26a4b08d293f6d4ea1fa7e1b48e112d2e6d907]
#
# patch "packages/gnash/gnash.inc"
# from [7f99a7149dd2fcb8a9df24834ec6d6ac432d96f8]
# to [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [97365313b90449385ae4470aba6254d39ecdd2ab]
# to [fea6fa33b56f90fb6590ac797faea3276a26a642]
#
============================================================
--- packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch 1a38468d94ec73034c8e40b001e46322f34fd48b
+++ packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch 1a38468d94ec73034c8e40b001e46322f34fd48b
@@ -0,0 +1,72 @@
+Index: midori-0.0.17/configure.in
+===================================================================
+--- midori-0.0.17.orig/configure.in 2008-03-10 18:08:54.000000000 +0800
++++ midori-0.0.17/configure.in 2008-03-10 18:10:04.000000000 +0800
+@@ -53,13 +53,13 @@
+ AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
+
+ # Checks for WebKitGtk
+-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
+ if test "x${have_webkit}" = "xfalse" ; then
+ AC_MSG_ERROR([No WebKitGtk package information found])
+ fi
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
++WEBKIT_VER=`pkg-config --modversion webkit-1.0`
+ AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
+
+ # Checks for libsexy
+Index: midori-0.0.17/src/global.h
+===================================================================
+--- midori-0.0.17.orig/src/global.h 2008-03-10 18:12:25.000000000 +0800
++++ midori-0.0.17/src/global.h 2008-03-10 18:12:29.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+
+ #include <gtk/gtk.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ // -- globals
+
+Index: midori-0.0.17/src/helpers.c
+===================================================================
+--- midori-0.0.17.orig/src/helpers.c 2008-03-10 18:14:43.000000000 +0800
++++ midori-0.0.17/src/helpers.c 2008-03-10 18:14:59.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+
+ #include <string.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ GtkIconTheme* get_icon_theme(GtkWidget* widget)
+ {
+Index: midori-0.0.17/src/webSearch.h
+===================================================================
+--- midori-0.0.17.orig/src/webSearch.h 2008-03-10 18:14:38.000000000 +0800
++++ midori-0.0.17/src/webSearch.h 2008-03-10 18:14:48.000000000 +0800
+@@ -16,7 +16,7 @@
+
+ #include <gtk/gtk.h>
+ #include <libsexy/sexy.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ // -- Types
+
+Index: midori-0.0.17/src/webView.h
+===================================================================
+--- midori-0.0.17.orig/src/webView.h 2008-03-10 18:14:15.000000000 +0800
++++ midori-0.0.17/src/webView.h 2008-03-10 18:14:18.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "browser.h"
+ #include "debug.h"
+
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ WebKitNavigationResponse
+ on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame
============================================================
--- packages/gtk-webcore/midori_0.0.17.bb 91913de32cf7b037f663c05eaf6700983c2818e1
+++ packages/gtk-webcore/midori_0.0.17.bb 91913de32cf7b037f663c05eaf6700983c2818e1
@@ -0,0 +1,10 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ file://webkit-pkgconfig.patch;patch=1 \
+ "
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 7f74b3f6c95f6b50d191cec8f892ed782b183e7b
+++ conf/distro/include/preferred-om-2008-versions.inc 3e26a4b08d293f6d4ea1fa7e1b48e112d2e6d907
@@ -2,12 +2,13 @@ PREFERRED_VERSION_dbus-glib = "0.74"
PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_dbus = "1.1.20"
PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gnash = "0.8.2"
PREFERRED_VERSION_gpsdrive = "2.10pre4"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_intltool = "0.35.5"
PREFERRED_VERSION_intltool-native = "0.35.5"
PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_vte = "0.16.10"
============================================================
--- packages/gnash/gnash.inc 7f99a7149dd2fcb8a9df24834ec6d6ac432d96f8
+++ packages/gnash/gnash.inc 66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -1,68 +1,30 @@ DESCRIPTION = "Gnash is a GNU Flash movi
DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
+HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+ "
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+inherit autotools pkgconfig
-
EXTRA_OECONF = "--enable-gui=gtk \
--enable-renderer=cairo \
- --enable-media=none \
+ --enable-media=none \
--disable-klash \
- --enable-z \
- --enable-jpeg \
- --disable-glext \
- --enable-Xft \
- --enable-expat \
- --enable-mad \
- --enable-cairo \
- --disable-plugin \
- --disable-cygnal \
- --with-boost-incl=${STAGING_INCDIR} \
- --with-boost-lib=${STAGING_LIBDIR} \
- --with-libxml-incl=${STAGING_INCDIR}/libxml2 \
- --with-libxml-lib=${STAGING_LIBDIR} \
- --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-# --with-glib-lib=${STAGING_LIBDIR} \
- --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
- --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-# --with-pango-lib=${STAGING_LIBDIR} \
- --with-sdl-incl=${STAGING_INCDIR}/SDL \
- --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
- --with-Xft-incl=${STAGING_INCDIR}/X11 \
- --with-expat-incl=${STAGING_INCDIR} \
- --with-mad-incl=${STAGING_INCDIR} \
- --with-cairo-incl=${STAGING_INCDIR}/cairo \
- --with-curl-incl=${STAGING_INCDIR} \
- --with-curl-lib=${STAGING_LIBDIR} \
- "
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-top-level=${STAGING_DIR_HOST}/usr \
+ "
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
- for i in `find . -name Makefile` ; do
- sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
- done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
- oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
- 'ZLIB_INCLUDE=${STAGING_INCDIR}' \
- 'ZLIB_LIBS=${STAGING_LIBDIR}' \
- 'PNG_INCLUDE=${STAGING_INCDIR}' \
- 'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
-
PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
@@ -73,7 +35,4 @@ FILES_libgnashserver = "${libdir}/libgna
FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+PARALLEL_MAKE = ""
-#do_stage() {
-# autotools_stage_all
-#}
-
============================================================
--- packages/python/python-pygtk_2.10.4.bb 97365313b90449385ae4470aba6254d39ecdd2ab
+++ packages/python/python-pygtk_2.10.4.bb fea6fa33b56f90fb6590ac797faea3276a26a642
@@ -6,10 +6,11 @@ LICENSE = "LGPL"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
LICENSE = "LGPL"
-PR = "ml5"
+PR = "ml6"
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch;patch=1 \
+ file://nodocs.patch;patch=1 \
file://acinclude.m4"
S = "${WORKDIR}/${SRCNAME}-${PV}"
#
# mt diff -ra6c27719ef581b67631459a7dcb52cea53fc0ccf -ra7621534097b2c1faa20dfa2e511d526282b8f93
#
#
#
# delete "packages/assassin"
#
# delete "packages/diversity"
#
# rename "packages/assassin/assassin_svn.bb"
# to "packages/openmoko-projects/assassin_svn.bb"
#
# rename "packages/diversity/diversity-daemon_svn.bb"
# to "packages/openmoko-projects/diversity-daemon_svn.bb"
#
# rename "packages/diversity/diversity-nav_svn.bb"
# to "packages/openmoko-projects/diversity-nav_svn.bb"
#
# add_dir "packages/openmoko-projects"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_file "packages/openmoko-projects/illume/include-path.diff"
# content [a1ec503b3b3943acdb39081bd0960a97b5ba1262]
#
# add_file "packages/openmoko-projects/illume_svn.bb"
# content [9e4ff325ee2fd027ba03143844adb1f205357ab1]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e417185fe87a77364d7d662829af7d8b658df96e]
# to [3dd1a196e482da03ba4107a6b06975fd0f997875]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [aac3826583975c175bafc024a5cb874d208e8e6f]
# to [5465bfaf66d8a3ef425cf40b6f027b07edf56c50]
#
============================================================
--- packages/openmoko-projects/illume/include-path.diff a1ec503b3b3943acdb39081bd0960a97b5ba1262
+++ packages/openmoko-projects/illume/include-path.diff a1ec503b3b3943acdb39081bd0960a97b5ba1262
@@ -0,0 +1,16 @@
+Include path fixes for Illume:
+
+$(includedir) is pointing to /usr/include, we do not want to have this when compiling
+
+Index: src/Makefile.am
+===================================================================
+--- a/src/Makefile.am (Revision 12)
++++ b/src/Makefile.am (Arbeitskopie)
+@@ -3,7 +3,6 @@
+
+ INCLUDES = -I. \
+ -I$(top_srcdir) \
+- -I$(includedir) \
+ @e_cflags@
+
+ pkgdir = $(datadir)/$(MODULE_ARCH)
============================================================
--- packages/openmoko-projects/illume_svn.bb 9e4ff325ee2fd027ba03143844adb1f205357ab1
+++ packages/openmoko-projects/illume_svn.bb 9e4ff325ee2fd027ba03143844adb1f205357ab1
@@ -0,0 +1,26 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+LICENSE = "MIT BSD"
+PV = "svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+ file://include-path.diff;patch=1"
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
+
+do_install_append() {
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
============================================================
--- conf/distro/include/sane-srcdates.inc e417185fe87a77364d7d662829af7d8b658df96e
+++ conf/distro/include/sane-srcdates.inc 3dd1a196e482da03ba4107a6b06975fd0f997875
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080216"
+EFL_SRCDATE = "20080311"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb aac3826583975c175bafc024a5cb874d208e8e6f
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 5465bfaf66d8a3ef425cf40b6f027b07edf56c50
@@ -100,9 +100,6 @@ do_install() {
do_install() {
cd ${BUILDDIR}
oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe
-
}
FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \
More information about the Openembedded-commits
mailing list