[oe-commits] org.oe.dev merge of '5ed39543fd08e1e8104ea222e307798781b5e351'
oe commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 17:49:45 UTC 2007
merge of '5ed39543fd08e1e8104ea222e307798781b5e351'
and 'c332c982f8fa3ab69315e4dff282b7530ca2737e'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3d02f890a5870026e323b8fbf644e2138a51e3a3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3d02f890a5870026e323b8fbf644e2138a51e3a3
Files:
1
classes/rm_work.bbclass
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
packages/scummvm/scummvm.inc
packages/scummvm/scummvm_0.9.1.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
mtn:execute
true
Diffs:
#
# mt diff -r5ed39543fd08e1e8104ea222e307798781b5e351 -r3d02f890a5870026e323b8fbf644e2138a51e3a3
#
#
#
# patch "classes/rm_work.bbclass"
# from [80b9b22e230989c7a6265d0b1860252d37fca5fb]
# to [512e310e8d6f9470aa971cd1e93948fdbdd80492]
#
============================================================
--- 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
#
# mt diff -rc332c982f8fa3ab69315e4dff282b7530ca2737e -r3d02f890a5870026e323b8fbf644e2138a51e3a3
#
#
#
# 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 "packages/scummvm/scummvm.inc"
# from [881cbe05da932099a88bebbb6f1576dde96ad1d6]
# to [195a28283db02d87e7361fce8f6cda1776848c24]
#
# patch "packages/scummvm/scummvm_0.9.1.bb"
# from [7a143213146b4e648a364d33165d80b505cff402]
# to [a7d83e6abecad479aeba9199278c19affc862fde]
#
# 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 = \
============================================================
--- packages/scummvm/scummvm.inc 881cbe05da932099a88bebbb6f1576dde96ad1d6
+++ packages/scummvm/scummvm.inc 195a28283db02d87e7361fce8f6cda1776848c24
@@ -1,4 +1,5 @@
-DESCRIPTION = "Virtual Machine for LucasArts Adventures"
+DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adventure games"
+HOMEPAGE = "http://www.scummvm.org"
SECTION = "games"
PRIORITY = "optional"
LICENSE = "GPL"
============================================================
--- packages/scummvm/scummvm_0.9.1.bb 7a143213146b4e648a364d33165d80b505cff402
+++ packages/scummvm/scummvm_0.9.1.bb a7d83e6abecad479aeba9199278c19affc862fde
@@ -1,8 +1,12 @@
-DEFAULT_PREFERENCE = "-1"
-
require scummvm.inc
DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
+SRC_URI += "file://makefile-nostrip.patch;patch=1"
+SRC_URI_append_openmoko = " file://openmoko-scummvm \
+ file://scummvm.desktop"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
EXTRA_OECONF += "--enable-lure \
--enable-agi \
--enable-cine \
@@ -10,7 +14,20 @@ do_compile() {
do_compile() {
oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
- DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+ DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
}
+do_install_append() {
+ if [ -f ${WORKDIR}/openmoko-scummvm ]; then
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm
+ fi
+ if [ -f ${WORKDIR}/scummvm.desktop ]; then
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications
+ fi
+ install -d ${D}${datadir}/scummvm
+ install -m 0644 gui/themes/modern.ini ${D}${datadir}/scummvm/
+ install -m 0644 gui/themes/modern.zip ${D}${datadir}/scummvm/
+}
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb c73bffb1e3641cde21223b8fe821232c15036b4d
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb c33cdc04da5f76dfa5814af63e8f55d82464ae61
@@ -1,8 +1,11 @@ PE = "1"
MESA_VER = "6.5.2"
require xorg-xserver-common.inc
PE = "1"
+PR = "r1"
+SRC_URI += "file://drmfix.patch;patch=1"
+
EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
export LDFLAGS += " -ldl "
More information about the Openembedded-commits
mailing list