[oe-commits] org.oe.dev merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 17:49:58 UTC 2007
merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
and '29d2dfa77e02cc2f8721d7954eb27c061486b2f4'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1ea498d1d340097845b2be21988d75b9f810b46a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ea498d1d340097845b2be21988d75b9f810b46a
Files:
1
classes/sip.bbclass
classes/sip3.bbclass
classes/sip4.bbclass
packages/python/python-pyqt_4.2.bb
packages/python/python-pyqt_4.3.bb
packages/sip/sip-native_3.10.1.bb
packages/sip/sip3-native_3.10.1
packages/sip/sip-native_4.0.1.bb
packages/sip/sip3-native_4.0.1.bb
packages/sip/sip4-native_4.4.5.bb
packages/sip/sip-native_4.7.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
packages/duma
packages/scummvm/files/fic-gta01
packages/xorg-xserver/xserver-xorg-1.3.0.0
packages/duma/duma_2.5.7.bb
packages/net-snmp/net-snmp-5.4.1/configure-tail.patch
packages/scummvm/files/fic-gta01/openmoko-scummvm
packages/scummvm/files/makefile-nostrip.patch
packages/scummvm/files/scummvm.desktop
packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
classes/rm_work.bbclass
conf/distro/include/slugos.inc
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/meta/slugos-packages.bb
packages/openmoko2/openmoko-contacts2_svn.bb
packages/scummvm/scummvm.inc
packages/scummvm/scummvm_0.9.1.bb
packages/tasks/task-mokogateway.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
mtn:execute
true
Diffs:
#
# mt diff -r1f413a8fc168cbef64fe984af210e9d998cc3382 -r1ea498d1d340097845b2be21988d75b9f810b46a
#
#
#
# rename "classes/sip.bbclass"
# to "classes/sip3.bbclass"
#
# rename "classes/sip4.bbclass"
# to "classes/sip.bbclass"
#
# rename "packages/python/python-pyqt_4.2.bb"
# to "packages/python/python-pyqt_4.3.bb"
#
# rename "packages/sip/sip-native_3.10.1.bb"
# to "packages/sip/sip3-native_3.10.1"
#
# rename "packages/sip/sip-native_4.0.1.bb"
# to "packages/sip/sip3-native_4.0.1.bb"
#
# rename "packages/sip/sip4-native_4.4.5.bb"
# to "packages/sip/sip-native_4.7.bb"
#
# patch "classes/sip.bbclass"
# from [80b361e9b97e13bf345538986f1b134f607db6ef]
# to [4012d4828567e24b5d46a88b61b5f951b18ae7f3]
#
# patch "classes/sip3.bbclass"
# from [2303d673f36cf2626f007237b4be21bd26581cce]
# to [73a1199d0cd0e38e5322e0047631d476afeb1f4b]
#
# patch "packages/python/python-pyqt_4.3.bb"
# from [1a1326664f9663662d7b770455cc8284beffd27a]
# to [cabb0d44a88033daaa2ef2312948f1a52cd4c0aa]
#
# patch "packages/python/python24-pyqt2_3.13.bb"
# from [8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e]
# to [a86c25cf42602e66a89c20552b8800b315d44ab8]
#
# patch "packages/python/python24-pyqwt2_3.10.bb"
# from [8cad0caa1d225ddbc989c027cf055ef8e7165f0a]
# to [d73c7873c5613b17078902a2de603a34cbb06184]
#
# patch "packages/sip/sip-native_4.7.bb"
# from [d6b14931a1957d3ac285ef26172a73a098ee96c3]
# to [ffb9c2a06301e9a83d6937e2920959e47eda7f25]
#
============================================================
--- classes/sip4.bbclass 80b361e9b97e13bf345538986f1b134f607db6ef
+++ classes/sip.bbclass 4012d4828567e24b5d46a88b61b5f951b18ae7f3
@@ -1,13 +1,13 @@
# Build Class for Sip based Python Bindings
# (C) Michael 'Mickey' Lauer <mickey at Vanille.de>
#
-DEPENDS =+ "sip4-native"
-RDEPENDS += "python-sip4"
+DEPENDS =+ "sip-native"
+RDEPENDS += "python-sip"
# default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1"
+# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
-sip4_do_generate() {
+sip_do_generate() {
if [ -z "${SIP_MODULES}" ]; then
MODULES="`ls sip/*mod.sip`"
else
============================================================
--- classes/sip.bbclass 2303d673f36cf2626f007237b4be21bd26581cce
+++ classes/sip3.bbclass 73a1199d0cd0e38e5322e0047631d476afeb1f4b
@@ -7,7 +7,7 @@ DEPENDS =+ "sip-native python-sip"
# default stuff, do not uncomment
# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
-sip_do_generate() {
+sip3_do_generate() {
if [ -z "${SIP_MODULES}" ]; then
MODULES="`ls sip/*mod.sip`"
else
============================================================
--- packages/python/python-pyqt_4.2.bb 1a1326664f9663662d7b770455cc8284beffd27a
+++ packages/python/python-pyqt_4.3.bb cabb0d44a88033daaa2ef2312948f1a52cd4c0aa
@@ -10,14 +10,30 @@ SRC_URI = "http://www.riverbankcomputing
SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
file://cross-compile.patch;patch=1"
+
+BROKEN = "1"
+# Something really fishy wrt. to arm/mips/etc. double vs. qreal. May even be a problem in Qt headers itself.
+# Symptons:
+#| sipQtCoreQTimeLine.cpp:136: error: conflicting return type specified for 'virtual double sipQTimeLine::valueForTime(int) const'
+#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qtimeline.h:92: error: overriding 'virtual qreal QTimeLine::valueForTime(int) const'
+# And:
+# | sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getRect(PyObject*, PyObject*)':
+| sipQtCoreQRectF.cpp:1182: error: no matching function for call to 'QRectF::getRect(double*, double*, double*, double*)'
+| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:725: note: candidates are: void QRectF::getRect(qreal*, qreal*, qreal*, qreal*) const
+| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getCoords(PyObject*, PyObject*)':
+| sipQtCoreQRectF.cpp:1237: error: no matching function for call to 'QRectF::getCoords(double*, double*, double*, double*)'
+| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:741: note: candidates are: void QRectF::getCoords(qreal*, qreal*, qreal*, qreal*) const
+| make[1]: *** [sipQtCoreQRectF.o] Error 1
+
+
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-inherit qmake qt4x11 sip4 distutils-base
+inherit qmake qt4x11 sip distutils-base
PARALLEL_MAKE = ""
QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
EXTRA_OEMAKE = " MAKEFLAGS= "
SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
============================================================
--- packages/python/python24-pyqt2_3.13.bb 8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e
+++ packages/python/python24-pyqt2_3.13.bb a86c25cf42602e66a89c20552b8800b315d44ab8
@@ -14,7 +14,7 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
file://features"
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-inherit palmtop sip distutils-base
+inherit palmtop sip3 distutils-base
QMAKE_PROFILES = "pyqt.pro"
EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
============================================================
--- packages/python/python24-pyqwt2_3.10.bb 8cad0caa1d225ddbc989c027cf055ef8e7165f0a
+++ packages/python/python24-pyqwt2_3.10.bb d73c7873c5613b17078902a2de603a34cbb06184
@@ -13,7 +13,7 @@ S = "${WORKDIR}/PyQwt-20040118"
file://features"
S = "${WORKDIR}/PyQwt-20040118"
-inherit palmtop sip distutils-base
+inherit palmtop sip3 distutils-base
QMAKE_PROFILES = "pyqwt.pro"
EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
============================================================
--- packages/sip/sip4-native_4.4.5.bb d6b14931a1957d3ac285ef26172a73a098ee96c3
+++ packages/sip/sip-native_4.7.bb ffb9c2a06301e9a83d6937e2920959e47eda7f25
@@ -1,5 +1,5 @@ DESCRIPTION = "SIP is a C++/Python Wrapp
DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
-SECTION = "base"
+SECTION = "devel"
HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
AUTHOR = "Phil Thompson"
PRIORITY = "optional"
@@ -8,7 +8,7 @@ S = "${WORKDIR}/sip-${PV}/sipgen"
SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
S = "${WORKDIR}/sip-${PV}/sipgen"
-inherit qmake native
+inherit qmake qt4x11 native
EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
#
# mt diff -r29d2dfa77e02cc2f8721d7954eb27c061486b2f4 -r1ea498d1d340097845b2be21988d75b9f810b46a
#
#
#
# add_dir "packages/duma"
#
# add_dir "packages/scummvm/files/fic-gta01"
#
# add_dir "packages/xorg-xserver/xserver-xorg-1.3.0.0"
#
# add_file "packages/duma/duma_2.5.7.bb"
# content [b1ca5760b7d15aded488f0d1f3c54a45f2cb1def]
#
# add_file "packages/net-snmp/net-snmp-5.4.1/configure-tail.patch"
# content [7c81048e14b5ee70bf7636e60b9d4c479a71f661]
#
# add_file "packages/scummvm/files/fic-gta01/openmoko-scummvm"
# content [2151aa3ba2826c460d0618140846150531a098bd]
#
# add_file "packages/scummvm/files/makefile-nostrip.patch"
# content [800d2b32c57cf34ae64bbeab62971be259376c87]
#
# add_file "packages/scummvm/files/scummvm.desktop"
# content [555a291650cf69e4657db44f746545b8179c89cd]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch"
# content [72edf4806ea57b3c561a14e789d07709534e163a]
#
# patch "classes/rm_work.bbclass"
# from [80b9b22e230989c7a6265d0b1860252d37fca5fb]
# to [512e310e8d6f9470aa971cd1e93948fdbdd80492]
#
# patch "conf/distro/include/slugos.inc"
# from [1ed5c83dbbd6bec20b79c26848084996f55b58d2]
# to [a724746ec3f5b6ab813d5d7a21e191799ed2518b]
#
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
# from [14115392139c7f57ea82db2f816b5069fffa2238]
# to [fac18deeba57a44702190636a5aeb017a33d2e86]
#
# patch "packages/apex/apex-nslu2_1.5.8.bb"
# from [a955d4e6ecf87a690890636436fb86c26ee760ec]
# to [15acb3b25031d818b76e970bb441e2b3b6844d3d]
#
# patch "packages/meta/slugos-packages.bb"
# from [e5f1bba85c8b995551d530e16be42c7fac65f8dd]
# to [0cce69bb0cbc207a39fab77c3054e03e4eb02abc]
#
# patch "packages/openmoko2/openmoko-contacts2_svn.bb"
# from [89c9f22ad6848e8903102483e1732ee620760f5b]
# to [4137abbdd1ecfbb908d43bd9f8c45eca419ea0b8]
#
# patch "packages/scummvm/scummvm.inc"
# from [881cbe05da932099a88bebbb6f1576dde96ad1d6]
# to [195a28283db02d87e7361fce8f6cda1776848c24]
#
# patch "packages/scummvm/scummvm_0.9.1.bb"
# from [7a143213146b4e648a364d33165d80b505cff402]
# to [a7d83e6abecad479aeba9199278c19affc862fde]
#
# patch "packages/tasks/task-mokogateway.bb"
# from [baab49be88ae0d782d8b73266ba9450f0c4af0a7]
# to [cca68ea72f5d84032e651bc005390558dc96dcb5]
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
# from [60aa521448a78ec17e7543808246323e44623474]
# to [9a281ac539ce984563ccaec7aa10f8986035f896]
#
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
# from [c73bffb1e3641cde21223b8fe821232c15036b4d]
# to [c33cdc04da5f76dfa5814af63e8f55d82464ae61]
#
# set "packages/scummvm/files/fic-gta01/openmoko-scummvm"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/duma/duma_2.5.7.bb b1ca5760b7d15aded488f0d1f3c54a45f2cb1def
+++ packages/duma/duma_2.5.7.bb b1ca5760b7d15aded488f0d1f3c54a45f2cb1def
@@ -0,0 +1,27 @@
+DESCRIPTION = "A Red-Zone memory allocator to detect unintended memory access"
+HOMEPAGE = "http://duma.sourceforge.net"
+LICENSE = "GPL LGPL"
+SECTION = "devel"
+DEPENDS = "qemu-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/duma/duma_2_5_7.tar.gz"
+
+S = "${WORKDIR}/duma_2_5_7"
+
+EXTRA_OECONF = "-e"
+
+do_configure () {
+ oe_runmake createconf
+ qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${HOST_SYS} ./createconf
+}
+
+do_compile () {
+ oe_runmake libduma.a libduma.so.0.0
+}
+
+do_install () {
+ install -d ${D}${base_bindir}
+ install -d ${D}${base_libdir}
+ install -d ${D}${mandir}/man3
+ oe_runmake install prefix="${D}" MAN_INSTALL_DIR="${D}${mandir}/man3"
+}
============================================================
--- packages/net-snmp/net-snmp-5.4.1/configure-tail.patch 7c81048e14b5ee70bf7636e60b9d4c479a71f661
+++ packages/net-snmp/net-snmp-5.4.1/configure-tail.patch 7c81048e14b5ee70bf7636e60b9d4c479a71f661
@@ -0,0 +1,99 @@
+diff -urN net-snmp-5.4.1-orig/acinclude.m4 net-snmp-5.4.1-patched/acinclude.m4
+--- net-snmp-5.4.1-orig/acinclude.m4 2006-08-15 05:25:49.000000000 +0200
++++ net-snmp-5.4.1-patched/acinclude.m4 2007-08-14 13:22:13.000000000 +0200
+@@ -39,7 +39,7 @@
+ dnl
+ AC_DEFUN([AC_PROMPT_USER],
+ [
+-MSG_CHECK=`echo "$2" | tail -1`
++MSG_CHECK=`echo "$2" | tail -n 1`
+ AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
+ [echo "" >&AC_FD_MSG
+ AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
+diff -urN net-snmp-5.4.1-orig/configure net-snmp-5.4.1-patched/configure
+--- net-snmp-5.4.1-orig/configure 2007-07-27 19:04:19.000000000 +0200
++++ net-snmp-5.4.1-patched/configure 2007-08-14 13:22:13.000000000 +0200
+@@ -26417,7 +26417,7 @@
+ # hpux make (at least) doesn't like a trailing \ on the last
+ # line even when the next line contains nothing but
+ # whitespace.
+- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ mv mk/$i.mk.tmp mk/$i.mk
+
+@@ -48793,7 +48793,7 @@
+
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+ LOC="@no.where"
+ fi
+@@ -48819,7 +48819,7 @@
+ Providing the --with-default-snmp-version=\"x\" parameter to ./configure
+ will avoid this prompt.
+
+-Default version of SNMP to use" | tail -1`
++Default version of SNMP to use" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then
+@@ -48903,7 +48903,7 @@
+ Providing the --with-sys-contact=\"contact\" parameter to ./configure
+ will avoid this prompt.
+
+-System Contact Information" | tail -1`
++System Contact Information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then
+@@ -48967,7 +48967,7 @@
+ Providing the --with-sys-location=\"location\" parameter to ./configure
+ will avoid this prompt.
+
+-System Location" | tail -1`
++System Location" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then
+@@ -49037,7 +49037,7 @@
+ Providing the --with-logfile=\"path\" parameter to ./configure
+ will avoid this prompt.
+
+-Location to write logfile" | tail -1`
++Location to write logfile" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then
+@@ -49114,7 +49114,7 @@
+ Providing the --with-persistent-directory=\"path\" parameter to
+ ./configure will avoid this prompt.
+
+-Location to write persistent information" | tail -1`
++Location to write persistent information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then
+diff -urN net-snmp-5.4.1-orig/configure.in net-snmp-5.4.1-patched/configure.in
+--- net-snmp-5.4.1-orig/configure.in 2007-07-27 19:02:00.000000000 +0200
++++ net-snmp-5.4.1-patched/configure.in 2007-08-14 13:22:13.000000000 +0200
+@@ -2465,7 +2465,7 @@
+ # hpux make (at least) doesn't like a trailing \ on the last
+ # line even when the next line contains nothing but
+ # whitespace.
+- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ mv mk/$i.mk.tmp mk/$i.mk
+
+@@ -4575,7 +4575,7 @@
+
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+ LOC="@no.where"
+ fi
============================================================
--- packages/scummvm/files/fic-gta01/openmoko-scummvm 2151aa3ba2826c460d0618140846150531a098bd
+++ packages/scummvm/files/fic-gta01/openmoko-scummvm 2151aa3ba2826c460d0618140846150531a098bd
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Save current AUX Key mapping
+SAVE_KEY="$(xmodmap -pke | grep 'keycode 8')"
+
+# Map AUX Key to F5
+xmodmap -e "keycode 8 = F5"
+
+# Turn LCD feft
+xrandr -o left
+
+# Start the scummvm in fullscreen mode
+scummvm --fullscreen --themepath=/usr/share/scummvm/
+
+# Turn LCD normal
+xrandr -o normal
+
+# Restore the AUX Key mapping
+xmodmap -e "$SAVE_KEY"
============================================================
--- packages/scummvm/files/makefile-nostrip.patch 800d2b32c57cf34ae64bbeab62971be259376c87
+++ packages/scummvm/files/makefile-nostrip.patch 800d2b32c57cf34ae64bbeab62971be259376c87
@@ -0,0 +1,13 @@
+Index: scummvm-0.9.1/Makefile
+===================================================================
+--- scummvm-0.9.1.orig/Makefile 2007-08-18 13:02:07.000000000 +0200
++++ scummvm-0.9.1/Makefile 2007-08-18 13:02:24.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ install: all
+ $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
============================================================
--- packages/scummvm/files/scummvm.desktop 555a291650cf69e4657db44f746545b8179c89cd
+++ packages/scummvm/files/scummvm.desktop 555a291650cf69e4657db44f746545b8179c89cd
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=openmoko-scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
============================================================
--- packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch 72edf4806ea57b3c561a14e789d07709534e163a
+++ packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch 72edf4806ea57b3c561a14e789d07709534e163a
@@ -0,0 +1,11 @@
+--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
+@@ -38,7 +38,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SOURCES = \
============================================================
--- classes/rm_work.bbclass 80b9b22e230989c7a6265d0b1860252d37fca5fb
+++ classes/rm_work.bbclass 512e310e8d6f9470aa971cd1e93948fdbdd80492
@@ -28,4 +28,4 @@ do_rm_work_all[recrdeptask] = "do_rm_wor
:
}
do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all after do_rm_work
-addtask rm_work_all
============================================================
--- conf/distro/include/slugos.inc 1ed5c83dbbd6bec20b79c26848084996f55b58d2
+++ conf/distro/include/slugos.inc a724746ec3f5b6ab813d5d7a21e191799ed2518b
@@ -145,3 +145,19 @@ PREFERRED_VERSION_linux-libc-headers = "
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb 14115392139c7f57ea82db2f816b5069fffa2238
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb fac18deeba57a44702190636a5aeb017a33d2e86
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/apex/apex-nslu2_1.5.8.bb a955d4e6ecf87a690890636436fb86c26ee760ec
+++ packages/apex/apex-nslu2_1.5.8.bb 15acb3b25031d818b76e970bb441e2b3b6844d3d
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/meta/slugos-packages.bb e5f1bba85c8b995551d530e16be42c7fac65f8dd
+++ packages/meta/slugos-packages.bb 0cce69bb0cbc207a39fab77c3054e03e4eb02abc
@@ -22,6 +22,7 @@ SLUGOS_PACKAGES = "\
alsa-lib \
alsa-utils \
apex-env \
+ apr \
asterisk \
asterisk-sounds \
atftp \
@@ -36,6 +37,8 @@ SLUGOS_PACKAGES = "\
binutils \
bison \
bluez-utils \
+ bogofilter \
+ boost \
bridge-utils \
bzip2 \
ccxstream \
@@ -61,7 +64,6 @@ SLUGOS_PACKAGES = "\
expat \
ez-ipupdate \
fconfig \
- fetchmail \
file \
findutils \
fis \
@@ -77,32 +79,39 @@ SLUGOS_PACKAGES = "\
glib-2.0 \
gnu-config \
grep \
+ groff \
gspcav1 \
gtk-doc \
gzip \
hdparm \
ifupdown \
+ iperf \
ipkg-utils \
iptables \
ircp \
+ irssi \
joe \
jpeg \
lcdproc \
less \
libao \
libdvb \
+ libexif \
libid3tag \
liblockfile \
libmad \
libmikmod \
libogg \
libol \
+ libpam \
+ libpcre \
libpng \
libtool \
libupnp \
libusb \
libvorbis \
libxml2 \
+ linphone \
litestream \
lrzsz \
lsof \
@@ -112,22 +121,27 @@ SLUGOS_PACKAGES = "\
madwifi-ng \
mailx \
make \
+ man man-pages \
masqmail \
mdadm \
+ mediatomb \
memtester \
mgetty \
miau \
microcom \
minicom \
motion \
+ mpd \
mt-daapd \
mtd-utils \
mutt \
+ mysql \
nail \
nano \
ncftp \
ncurses \
netcat \
+ netpbm \
nfs-utils \
nmap \
ntfs-3g \
@@ -136,19 +150,20 @@ SLUGOS_PACKAGES = "\
obexftp \
obexpush \
openobex-apps \
- openldap \
openntpd \
openobex \
openssh \
openvpn \
patch \
pciutils \
- libpcre \
perl \
picocom \
pkgconfig \
+ popt \
+ postfix \
ppp \
procps \
+ psmisc \
puppy \
python \
quilt \
@@ -156,6 +171,7 @@ SLUGOS_PACKAGES = "\
rng-tools \
rsync \
samba \
+ screen \
sed \
setpwc \
setserial \
@@ -165,15 +181,18 @@ SLUGOS_PACKAGES = "\
ssmtp \
strace \
streamripper \
+ sudo \
sysfsutils \
tar \
task-mokogateway-everything \
thttpd \
tiff \
+ timezones \
tzdata \
unzip \
upslug2 \
usbutils \
+ ushare \
util-linux \
vim \
vlan \
@@ -186,6 +205,10 @@ SLUGOS_PACKAGES = "\
wireless-tools \
wireshark \
wpa-supplicant \
+ wview-sim wview-vpro wview-wxt510 \
+ xinetd \
+ yeaphone \
+%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list