summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-01 19:40:07 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-01 19:40:07 +0000
commit50952bd22e874c818b28a5a9451d30f17d1b2f88 (patch)
tree737b72b24ca1becccac972040a051195246d79dd
parent78515aa5900086d8ff38ba46c421f06504e533f4 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/01 20:08:09+01:00 handhelds.org!CoreDump Typo fix 2005/01/01 19:02:02+00:00 nexus.co.uk!pb remove some hardcoded paths and opie-isms 2005/01/01 19:51:55+01:00 handhelds.org!CoreDump Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded 2005/01/01 19:51:43+01:00 handhelds.org!CoreDump Splitt prboom in prboom and prboom-opie 2005/01/01 18:44:15+00:00 nexus.co.uk!pb add gsoko to gpe-task-games 2005/01/01 18:42:38+00:00 nexus.co.uk!pb update bluez-libs to 2.13 BKrev: 41d6fc970r35tAipPiyBrGp6XrLs7A
-rw-r--r--packages/bluez-libs/bluez-libs_2.13.bb (renamed from packages/prboom/prboom-2.2.6/m4.patch)0
-rw-r--r--packages/meta/meta-gpe.bb3
-rw-r--r--packages/prboom/files/m4.patch (renamed from packages/prboom/prboom-2.3.1/m4.patch)0
-rw-r--r--packages/prboom/files/prboom.desktop (renamed from packages/prboom/prboom-2.2.6/prboom.desktop)0
-rw-r--r--packages/prboom/files/prboom.png (renamed from packages/prboom/prboom-2.2.6/prboom.png)0
-rw-r--r--packages/prboom/prboom-2.3.1/prboom.png0
-rw-r--r--packages/prboom/prboom-opie_2.2.6.bb (renamed from packages/prboom/prboom-2.3.1/prboom.desktop)0
-rw-r--r--packages/prboom/prboom_2.2.6.bb30
-rw-r--r--packages/prboom/prboom_2.3.1.bb2
9 files changed, 33 insertions, 2 deletions
diff --git a/packages/prboom/prboom-2.2.6/m4.patch b/packages/bluez-libs/bluez-libs_2.13.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/prboom/prboom-2.2.6/m4.patch
+++ b/packages/bluez-libs/bluez-libs_2.13.bb
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index cc1240d013..506d8a0adc 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r29"
+PR = "r30"
ALLOW_EMPTY = 1
@@ -95,6 +95,7 @@ gpe-task-games = "\
gpe-tetris \
gpe-othello \
gpe-lights \
+ gsoko \
xdemineur"
RDEPENDS_gpe-task-games := "${gpe-task-games}"
diff --git a/packages/prboom/prboom-2.3.1/m4.patch b/packages/prboom/files/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/prboom/prboom-2.3.1/m4.patch
+++ b/packages/prboom/files/m4.patch
diff --git a/packages/prboom/prboom-2.2.6/prboom.desktop b/packages/prboom/files/prboom.desktop
index e69de29bb2..e69de29bb2 100644
--- a/packages/prboom/prboom-2.2.6/prboom.desktop
+++ b/packages/prboom/files/prboom.desktop
diff --git a/packages/prboom/prboom-2.2.6/prboom.png b/packages/prboom/files/prboom.png
index e69de29bb2..e69de29bb2 100644
--- a/packages/prboom/prboom-2.2.6/prboom.png
+++ b/packages/prboom/files/prboom.png
diff --git a/packages/prboom/prboom-2.3.1/prboom.png b/packages/prboom/prboom-2.3.1/prboom.png
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/prboom/prboom-2.3.1/prboom.png
+++ /dev/null
diff --git a/packages/prboom/prboom-2.3.1/prboom.desktop b/packages/prboom/prboom-opie_2.2.6.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/prboom/prboom-2.3.1/prboom.desktop
+++ b/packages/prboom/prboom-opie_2.2.6.bb
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
index e69de29bb2..15a0482d2e 100644
--- a/packages/prboom/prboom_2.2.6.bb
+++ b/packages/prboom/prboom_2.2.6.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A Doom Clone based on SDL"
+SECTION = "games"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
+LICENSE = "GPL"
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
+ file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} "
+
+do_configure() {
+ PATH=${STAGING_BINDIR}:$PATH
+ gnu-configize
+ oe_runconf
+}
+
+do_install() {
+ install -d ${D}${bindir} \
+ ${D}${datadir}/games/doom
+
+ install -m 0755 src/prboom ${D}${bindir}/prboom
+ install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/
+}
+
+FILES_${PN} += "${datadir}/games/doom/prboom.wad"
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 2990bb4350..abc17009dc 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
# This version can be started w/ -height 240 but it
# a) doesn't load doom1.wad (crash)
# b) crahes a few seconds after starting w/ doom2.wad
-DEFAULT_PREFERRENCE = -1
+DEFAULT_PREFERENCE = -1
SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
file://m4.patch;patch=1 \