Merge bk://oe-devel@oe-devel.bkbits.net/packages

into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/12/01 16:16:18+01:00 hrw.one.pl!hrw
prboom updated to 2.3.1

2004/12/01 16:15:20+01:00 hrw.one.pl!hrw
set PACKAGE_ARCH to "all" for tickypip levels

BKrev: 41ade06dY0nJfERU6JExuadNcWSotg

8 files changed, 36 insertions, 221 deletions

diff --git a/prboom/prboom-2.3.0/m4.patch b/prboom/prboom-2.3.0/m4.patch
deleted file mode 100644
index e7918156e2..0000000000
--- a/prboom/prboom-2.3.0/m4.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ Src/m4/sdl.m4	2004-01-21 00:43:55.000000000 +0100
-@@ -0,0 +1,175 @@
-+# Configure paths for SDL
-+# Sam Lantinga 9/21/99
-+# stolen from Manish Singh
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_SDL,
-+[dnl 
-+dnl Get the cflags and libraries from the sdl-config script
-+dnl
-+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-+            sdl_prefix="$withval", sdl_prefix="")
-+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
-+		    , enable_sdltest=yes)
-+
-+  if test x$sdl_exec_prefix != x ; then
-+     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-+     if test x${SDL_CONFIG+set} != xset ; then
-+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-+     fi
-+  fi
-+  if test x$sdl_prefix != x ; then
-+     sdl_args="$sdl_args --prefix=$sdl_prefix"
-+     if test x${SDL_CONFIG+set} != xset ; then
-+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-+     fi
-+  fi
-+
-+  AC_REQUIRE([AC_CANONICAL_TARGET])
-+  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-+  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-+  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-+  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-+  no_sdl=""
-+  if test "$SDL_CONFIG" = "no" ; then
-+    no_sdl=yes
-+  else
-+    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-+    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-+
-+    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_sdltest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $SDL_CFLAGS"
-+      LIBS="$LIBS $SDL_LIBS"
-+dnl
-+dnl Now check if the installed SDL is sufficiently new. (Also sanity
-+dnl checks the results of sdl-config to some extent
-+dnl
-+      rm -f conf.sdltest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "SDL.h"
-+
-+char*
-+my_strdup (char *str)
-+{
-+  char *new_str;
-+  
-+  if (str)
-+    {
-+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+      strcpy (new_str, str);
-+    }
-+  else
-+    new_str = NULL;
-+  
-+  return new_str;
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  /* This hangs on some systems (?)
-+  system ("touch conf.sdltest");
-+  */
-+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_sdl_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_sdl_version");
-+     exit(1);
-+   }
-+
-+   if (($sdl_major_version > major) ||
-+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-+    {
-+      return 0;
-+    }
-+  else
-+    {
-+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-+      printf("*** best to upgrade to the required version.\n");
-+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-+      printf("*** config.cache before re-running configure\n");
-+      return 1;
-+    }
-+}
-+
-+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_sdl" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$SDL_CONFIG" = "no" ; then
-+       echo "*** The sdl-config script installed by SDL could not be found"
-+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-+       echo "*** full path to sdl-config."
-+     else
-+       if test -f conf.sdltest ; then
-+        :
-+       else
-+          echo "*** Could not run SDL test program, checking why..."
-+          CFLAGS="$CFLAGS $SDL_CFLAGS"
-+          LIBS="$LIBS $SDL_LIBS"
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include "SDL.h"
-+
-+int main(int argc, char *argv[])
-+{ return 0; }
-+#undef  main
-+#define main K_and_R_C_main
-+],      [ return 0; ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-+          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     SDL_CFLAGS=""
-+     SDL_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(SDL_CFLAGS)
-+  AC_SUBST(SDL_LIBS)
-+  rm -f conf.sdltest
-+])
diff --git a/prboom/prboom-2.3.0/prboom.desktop b/prboom/prboom-2.3.0/prboom.desktop
deleted file mode 100644
index f3920b7004..0000000000
--- a/prboom/prboom-2.3.0/prboom.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Comment=Doom Emulator
-Exec=prboom
-Icon=prboom
-Type=Application
-Name=PrBoom
-
diff --git a/prboom/prboom-2.3.0/prboom.png b/prboom/prboom-2.3.1/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/prboom/prboom-2.3.0/prboom.png
+++ b/prboom/prboom-2.3.1/m4.patch
diff --git a/prboom/prboom-2.3.1/prboom.desktop b/prboom/prboom-2.3.1/prboom.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/prboom/prboom-2.3.1/prboom.desktop
diff --git a/prboom/prboom-2.3.1/prboom.png b/prboom/prboom-2.3.1/prboom.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/prboom/prboom-2.3.1/prboom.png
diff --git a/prboom/prboom_2.3.0.oe b/prboom/prboom_2.3.0.oe
deleted file mode 100644
index ab2e8c2d71..0000000000
--- a/prboom/prboom_2.3.0.oe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "A Doom Clone based on SDL"
-SECTION = "opie/games"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libsdl-mixer libsdl-net"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
-           file://prboom.png \
-           file://prboom.desktop"
-
-inherit autotools 
-
-EXTRA_OECONF = "--without-x --disable-sdltest"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
-do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-        	   ${D}/${palmtopdir}/apps/Games \
-        	   ${D}/${palmtopdir}/pics
-	install -m 0755 src/prboom ${D}/${palmtopdir}/bin/prboom
-	install -m 0644 ${WORKDIR}/prboom.png ${D}/${palmtopdir}/pics/prboom.png
-	install -m 0644 ${WORKDIR}/prboom.desktop ${D}/${palmtopdir}/apps/Games/prboom.desktop
-}
-
-FILES_${PN} = "${palmtopdir}"
diff --git a/prboom/prboom_2.3.1.oe b/prboom/prboom_2.3.1.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/prboom/prboom_2.3.1.oe
diff --git a/tickypip/tickypip-levels_1.1.oe b/tickypip/tickypip-levels_1.1.oe
index e69de29bb2..feb084dc79 100644
--- a/tickypip/tickypip-levels_1.1.oe
+++ b/tickypip/tickypip-levels_1.1.oe
@@ -0,0 +1,36 @@
+DESCRIPTION = "Tickypip levels from NetWalk Group"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "${PN}"
+SRC_DISTRIBUTE_LICENSES += "${PN}"
+AUTHOR = "NetWalk Group <netwalkgroup@hotmail.com>"
+RDEPENDS = "tickypip"
+PACKAGE_ARCH = "all"
+PR = "r1"
+
+SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/tickypip-levels_${PV}.tar.bz2"
+
+S = "${WORKDIR}/"
+
+#
+# Authors response to LICENSE question:
+#
+# You may distribute them for free provide that you have links to our level
+# packs in PalmGear.
+#
+# Packs available on PalmGear: Pak1, Pak3, Pak8, Pak9, Pak10
+# 
+# URL: http://palmgear.com/index.cfm?fuseaction=software.developer&userID=862314499
+#
+# I also got permission to distribute rest of levelpacks which was available
+# from Palm Gaming World:
+# http://www.palmgamingworld.com/add-in/netwalk.shtml
+#
+
+do_install () {
+	install -d ${D}/${palmtopdir}/share/tickypip/levels
+	install -m 0644 levels/* ${D}/${palmtopdir}/share/tickypip/levels/
+}
+
+FILES_${PN} = "${palmtopdir}/"