Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/01 18:36:32+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 18:35:06+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 19:34:59+01:00 hrw.one.pl!hrw
add missing patch to gtk+ 2.6.0

2005/01/01 19:24:58+01:00 hrw.one.pl!hrw
added missing dependencies to librsvg

2005/01/01 19:23:00+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/01 19:17:46+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 10:40:49-08:00 (none)!ggilbert
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into olddog.(none):/home/ggilbert/oe/openembedded

2005/01/01 10:40:21-08:00 (none)!ggilbert
Many files:
  Adding more LICENSES

2005/01/01 18:34:46+00:00 nexus.co.uk!pb
add gpe-lights to gpe-task-games

2005/01/01 19:17:34+01:00 handhelds.org!CoreDump
prboom_2.3.1.bb:
  prboom: Set DEFAULT_PREFERRENCE = -1 for 2.3.1
prboom_2.2.6.bb, prboom.png, prboom.desktop, m4.patch:
  new file

2005/01/01 17:39:51+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 17:39:24+00:00 nexus.co.uk!pb
disable JIS encodings in rxvt-unicode

2005/01/01 17:17:42+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/01 16:50:14+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2004/12/31 23:30:31+01:00 hrw.one.pl!hrw
removed verdana & georgia fonts from meta-opie due to LICENSE

BKrev: 41d6eeb7-0v1WWxOR9ezdVHMi6M7xA

5 files changed, 5 insertions, 0 deletions

diff --git a/packages/prboom/prboom-2.2.6/m4.patch b/packages/prboom/prboom-2.2.6/m4.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/m4.patch
diff --git a/packages/prboom/prboom-2.2.6/prboom.desktop b/packages/prboom/prboom-2.2.6/prboom.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/prboom.desktop
diff --git a/packages/prboom/prboom-2.2.6/prboom.png b/packages/prboom/prboom-2.2.6/prboom.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/prboom.png
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom_2.2.6.bb
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 31330ce641..2990bb4350 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -4,6 +4,11 @@ PRIORITY = "optional"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-net"
 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
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://m4.patch;patch=1 \
            file://prboom.png \