[oe-commits] org.oe.dev merge of '826e3d1604a7153fbec79dbf0287cbde9dd32200'
john_lee commit
oe at amethyst.openembedded.net
Fri Apr 25 15:38:42 UTC 2008
merge of '826e3d1604a7153fbec79dbf0287cbde9dd32200'
and 'e8ef8cbc778629395b3eb845590295f8c168d5c1'
Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: eb2c29a8fa04733b65b2044caf546845c02f511c
ViewMTN: http://monotone.openembedded.org/revision/info/eb2c29a8fa04733b65b2044caf546845c02f511c
Files:
1
packages/gnash/gnash_0.8.2.bb
packages/gtk-webcore/midori_0.0.17.bb
packages/python/python-pygtk/nodocs.patch
conf/distro/include/preferred-om-2008-versions.inc
packages/gnash/gnash.inc
packages/python/python-pygtk_2.10.4.bb
packages/qtopia-phone/qtopia-phone-x11/Xsession.d
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
Diffs:
#
# mt diff -r826e3d1604a7153fbec79dbf0287cbde9dd32200 -reb2c29a8fa04733b65b2044caf546845c02f511c
#
#
#
# add_file "packages/gnash/gnash_0.8.2.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gtk-webcore/midori_0.0.17.bb"
# content [3d8f7815947175065c2271654f26e21a970b8305]
#
# add_file "packages/python/python-pygtk/nodocs.patch"
# content [50abf04fa1f14dd2f24ef8908651dcb30227d518]
#
# 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.bb 3d8f7815947175065c2271654f26e21a970b8305
+++ packages/gtk-webcore/midori_0.0.17.bb 3d8f7815947175065c2271654f26e21a970b8305
@@ -0,0 +1,11 @@
+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-update.patch;patch=1"
+
+
============================================================
--- packages/python/python-pygtk/nodocs.patch 50abf04fa1f14dd2f24ef8908651dcb30227d518
+++ packages/python/python-pygtk/nodocs.patch 50abf04fa1f14dd2f24ef8908651dcb30227d518
@@ -0,0 +1,13 @@
+Index: pygtk-2.10.4/Makefile.am
+===================================================================
+--- pygtk-2.10.4.orig/Makefile.am
++++ pygtk-2.10.4/Makefile.am
+@@ -4,7 +4,7 @@ if BUILD_GTK
+ GTK_SUBDIR = gtk
+ endif
+
+-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
+
+ PLATFORM_VERSION = 2.0
+
============================================================
--- 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 -re8ef8cbc778629395b3eb845590295f8c168d5c1 -reb2c29a8fa04733b65b2044caf546845c02f511c
#
#
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/Xsession.d"
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
# content [d4c0aafd1334ad5324011a762d43cf91f294aa5c]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [5465bfaf66d8a3ef425cf40b6f027b07edf56c50]
# to [793f42a67a2b3684beeeb96f10259216c87d06fc]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia d4c0aafd1334ad5324011a762d43cf91f294aa5c
+++ packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia d4c0aafd1334ad5324011a762d43cf91f294aa5c
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# path setup
+export QPEDIR=/opt/Qtopia
+export PATH=$QPEDIR/bin:$PATH
+
+#tell how to inform illume on incoming phone calls
+#export ILLUME_PHONE_CALL=
+
+
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 223 = 0x11000601"
+xmodmap -e "keycode 224 = 0x11000602"
+xmodmap -e "keycode 225 = 0x11000603"
+xmodmap -e "keycode 226 = 0x11000604"
+xmodmap -e "keycode 227 = 0x11000605"
+xmodmap -e "keycode 228 = 0x11000606"
+xmodmap -e "keycode 229 = 0x11000607"
+xmodmap -e "keycode 230 = 0x11000608"
+xmodmap -e "keycode 231 = 0x11000609"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 232 = 0x1100060B"
+xmodmap -e "keycode 233 = 0x1100060B"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 234 = 0x1100060C"
+xmodmap -e "keycode 235 = 0x1100060D"
+xmodmap -e "keycode 236 = 0x1100060E"
+xmodmap -e "keycode 237 = 0x1100060F"
+xmodmap -e "keycode 238 = 0x11000610"
+xmodmap -e "keycode 239 = 0x1008ff26"
+
+# Now start Qtopia
+exec qpe
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 5465bfaf66d8a3ef425cf40b6f027b07edf56c50
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 793f42a67a2b3684beeeb96f10259216c87d06fc
@@ -16,11 +16,12 @@ SRC_URI = "git://git.openmoko.org/git/qt
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
file://device-conf \
- file://qplatformdefs.h"
+ file://qplatformdefs.h \
+ file://Xsession.d/99qtopia"
S = "${WORKDIR}/git"
-inherit pkgconfig update-rc.d
+inherit pkgconfig
TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
@@ -29,9 +30,6 @@ TARGET-DEVICE="${@base_contains('MACHINE
TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"
-INITSCRIPT_NAME = "qpe"
-INITSCRIPT_PARAMS = "defaults 98"
-
export QTOPIA_DEPOT_PATH = "${S}"
require qtopia-phone_arch.inc
@@ -100,6 +98,24 @@ do_install() {
do_install() {
cd ${BUILDDIR}
oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
+
+ # Install freedesktop.org .desktop files for enlightenment
+ install -d ${D}${datadir}/applications
+ for app in "${S}/apps-fdo/"*; do
+ for file in "$app"/*.desktop; do
+ install -m 0644 $file ${D}${datadir}/applications/
+ done
+ done
+
+ # Install good icons for the desktop files
+
+ # Make sure qpe gets launched by X
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 0755 ${WORKDIR}/Xsession.d/99qtopia ${D}${sysconfdir}/X11/Xsession.d/
+
+ # Install some scripts
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
}
FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \
More information about the Openembedded-commits
mailing list