[oe-commits] org.oe.dev merge of '0521752c751b5734b320120045655229b2faff4f'
mickeyl commit
oe at amethyst.openembedded.net
Wed Jul 30 16:35:38 UTC 2008
merge of '0521752c751b5734b320120045655229b2faff4f'
and 'f75d239d7378665c50aea95b24abbfc6a815bd43'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 368c3f8ff3b1b9dcaff963660d353cc8e2739101
ViewMTN: http://monotone.openembedded.org/revision/info/368c3f8ff3b1b9dcaff963660d353cc8e2739101
Files:
1
packages/numptyphysics
packages/numptyphysics/numptyphysics_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/images/fso-image.bb
packages/classpath/classpath-minimal_0.97.2.bb
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/dsplink/files/ticel-config
Diffs:
#
# mt diff -r0521752c751b5734b320120045655229b2faff4f -r368c3f8ff3b1b9dcaff963660d353cc8e2739101
#
#
#
# add_dir "packages/numptyphysics"
#
# add_file "packages/numptyphysics/numptyphysics_svn.bb"
# content [ed831effd3c3ba20e55d8e3004b5808bb5076151]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a9e403c8ad9bd1cce3d2f28c2b7cd0c69e2020c4]
# to [245f2a89cc214a05b8c6bf94faaac74d027b36c0]
#
# patch "packages/images/fso-image.bb"
# from [98a9bf4d2bcc9614c6b5f03cdbc6780b167268f7]
# to [b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46]
#
============================================================
--- packages/numptyphysics/numptyphysics_svn.bb ed831effd3c3ba20e55d8e3004b5808bb5076151
+++ packages/numptyphysics/numptyphysics_svn.bb ed831effd3c3ba20e55d8e3004b5808bb5076151
@@ -0,0 +1,38 @@
+DESCRIPTION = "Numpty Physics is a drawing puzzle game in the spirit (and style?) \
+of Crayon Physics using the same excellent Box2D engine."
+DEPENDS = "virtual/libsdl libsdl-image"
+LICENSE = "GPL"
+HOMEPAGE = "http://numptyphysics.garage.maemo.org/"
+SECTION = "x11/games"
+PV = "0.2+svnr${SRCREV}"
+
+SRC_URI = "\
+ svn://garage.maemo.org/svn/${PN};module=trunk;proto=https \
+ http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz \
+"
+S = "${WORKDIR}/trunk"
+
+EXTRA_S = "${WORKDIR}/local/packages/numptyphysics"
+
+# what an ugly buildsystem... handcrafted Makefiles... back to the stoneage
+export CCOPTS = "${CFLAGS} -I Box2D/Include"
+export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image"
+
+do_configure() {
+ for i in Config.h Makefile Game.cpp; do
+ install -m 0644 ${EXTRA_S}/$i ${S}
+ done
+}
+
+do_install() {
+ install -d ${D}${datadir}/numptyphysics
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/applications
+ install -m 0755 ${S}/arm/Game ${D}${bindir}/numptyphysics
+ install -m 0644 ${EXTRA_S}/star.png ${D}${datadir}/pixmaps
+ install -m 0644 ${EXTRA_S}/numptyphysics.desktop ${D}/${datadir}/applications
+ cp -a ${EXTRA_S}/data/* ${D}/${datadir}/numptyphysics/
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- conf/distro/include/sane-srcrevs.inc a9e403c8ad9bd1cce3d2f28c2b7cd0c69e2020c4
+++ conf/distro/include/sane-srcrevs.inc 245f2a89cc214a05b8c6bf94faaac74d027b36c0
@@ -93,6 +93,7 @@ SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-networkmanager ?= "3202"
SRCREV_pn-networkmanager-applet ?= "200"
+SRCREV_pn-numptyphysics = "45"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
============================================================
--- packages/images/fso-image.bb 98a9bf4d2bcc9614c6b5f03cdbc6780b167268f7
+++ packages/images/fso-image.bb b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46
@@ -71,6 +71,10 @@ GTK_INSTALL = "\
tangogps-fso \
"
+GAMES_INSTALL = "\
+ numptyphysics \
+"
+
# FIXME these should rather be part of alsa-state,
# once Om stabilizes them...
AUDIO_INSTALL_append_om-gta01 = "\
@@ -98,6 +102,7 @@ IMAGE_INSTALL = "\
${BASE_INSTALL} \
${X_INSTALL} \
${GTK_INSTALL} \
+ ${GAMES_INSTALL} \
${AUDIO_INSTALL} \
${TOOLS_INSTALL} \
${PYTHON_INSTALL} \
#
# mt diff -rf75d239d7378665c50aea95b24abbfc6a815bd43 -r368c3f8ff3b1b9dcaff963660d353cc8e2739101
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a41931d45bc89cf1f17499d2c57e729ee6ba3b9c]
# to [245f2a89cc214a05b8c6bf94faaac74d027b36c0]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [eeed706438d6b4b51f8ecb1582addd8a6820f098]
# to [2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [3aa4a5c65d7f50eb4aa7926b5c458280ec0ac1e9]
# to [332e3019b56cf0c6eaf5edf7c8fb23451cb14134]
#
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
# from [ac9527b9ee0c35149983f59fb0f3d92f5e62cbc2]
# to [e2afdfeb29764460993e9c85a9a3ef63b5cce201]
#
# patch "packages/dsplink/files/ticel-config"
# from [84cb94f0bdf0de83e7416a78d8d04d70018657c0]
# to [302f76fa00591ad6753fc3643e29854d8bc4bc81]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc a41931d45bc89cf1f17499d2c57e729ee6ba3b9c
+++ conf/distro/include/sane-srcrevs.inc 245f2a89cc214a05b8c6bf94faaac74d027b36c0
@@ -139,9 +139,9 @@ SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4488"
-SRCREV_pn-opkg-native ?= "4491"
-SRCREV_pn-opkg-sdk ?= "4488"
+SRCREV_pn-opkg ?= "4564"
+SRCREV_pn-opkg-native ?= "4564"
+SRCREV_pn-opkg-sdk ?= "4564"
SRCREV_pn-opkg-utils ?= "4534"
SRCREV_pn-opkg-utils-native ?= "4534"
SRCREV_pn-oprofileui ?= "173"
============================================================
--- packages/classpath/classpath-minimal_0.97.2.bb eeed706438d6b4b51f8ecb1582addd8a6820f098
+++ packages/classpath/classpath-minimal_0.97.2.bb 2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604
@@ -3,6 +3,7 @@ SRC_URI += "\
SRC_URI += "\
file://netif_16.patch;patch=1;pnum=0 \
file://SimpleName.diff;patch=1;pnum=0 \
+ file://javanet-local.patch;patch=1;pnum=0 \
"
PR = "r0"
============================================================
--- packages/dsplink/codec-engine_2.10.bb 3aa4a5c65d7f50eb4aa7926b5c458280ec0ac1e9
+++ packages/dsplink/codec-engine_2.10.bb 332e3019b56cf0c6eaf5edf7c8fb23451cb14134
@@ -5,7 +5,7 @@ inherit module
inherit module
-PR = "r5"
+PR = "r7"
PV = "2.10"
# Get CE tarball from TI website, place in sources and calculate
@@ -94,6 +94,7 @@ export DSPLIBS = "${S}/packages/ti/sdo/c
${S}/packages/ti/sdo/ce/alg/lib/*.a* \
${S}/cetools/packages/ti/sdo/fc/dman3/*.a* \
${S}/cetools/packages/ti/sdo/fc/acpy3/*.a* \
+ ${S}/packages/ti/sdo/ce/osal/linux/lib/osal_linux_470.a* \
${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a* \
${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a* \
"
============================================================
--- packages/dsplink/dsplink_1.51.00.08.bb ac9527b9ee0c35149983f59fb0f3d92f5e62cbc2
+++ packages/dsplink/dsplink_1.51.00.08.bb e2afdfeb29764460993e9c85a9a3ef63b5cce201
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_armv7a = "1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
-PR = "r9"
+PR = "r10"
PE = "1"
PV = "1.51"
@@ -19,5 +19,9 @@ SRC_URI = "http://install.tarball.in.sou
file://prcs-fix-include.patch;patch=1;pnum=2 \
"
+SRC_URI_append_beagleboard = " \
+ file://dsplink-128M.patch;patch=1;pnum=2 \
+"
+
S = "${WORKDIR}/dsplink_1_51_00_08/dsplink"
============================================================
--- packages/dsplink/files/ticel-config 84cb94f0bdf0de83e7416a78d8d04d70018657c0
+++ packages/dsplink/files/ticel-config 302f76fa00591ad6753fc3643e29854d8bc4bc81
@@ -2,7 +2,6 @@ for lib in \
LIBS=""
for lib in \
- decode_x470MV.a \
TraceUtil.a \
bioslog.a \
video.a \
@@ -11,8 +10,7 @@ for lib in \
ce.a \
Algorithm_noOS.a \
alg.a \
- osal_dsplink_linux.a \
- osal_dsplink_linux_6446.a \
+ osal_linux_470.a \
dman3Cfg.a \
acpy3.a \
cmem.a \
More information about the Openembedded-commits
mailing list