From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/frodo/frodo-4.2/.mtn2git_empty | 0 packages/frodo/frodo-4.2/Frodo.png | Bin 0 -> 1370 bytes packages/frodo/frodo-4.2/configure.patch | 51 +++++++ packages/frodo/frodo-4.2/frodo.desktop | 6 + packages/frodo/frodo-4.2/frodorc | 26 ++++ packages/frodo/frodo-4.2/m4.patch | 183 ++++++++++++++++++++++++++ packages/frodo/frodo-4.2/no-pref-editor.patch | 27 ++++ 7 files changed, 293 insertions(+) create mode 100644 packages/frodo/frodo-4.2/.mtn2git_empty (limited to 'packages/frodo/frodo-4.2') diff --git a/packages/frodo/frodo-4.2/.mtn2git_empty b/packages/frodo/frodo-4.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/frodo/frodo-4.2/Frodo.png b/packages/frodo/frodo-4.2/Frodo.png index e69de29bb2..e346195b84 100644 Binary files a/packages/frodo/frodo-4.2/Frodo.png and b/packages/frodo/frodo-4.2/Frodo.png differ diff --git a/packages/frodo/frodo-4.2/configure.patch b/packages/frodo/frodo-4.2/configure.patch index e69de29bb2..1fc26f4119 100644 --- a/packages/frodo/frodo-4.2/configure.patch +++ b/packages/frodo/frodo-4.2/configure.patch @@ -0,0 +1,51 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Src/configure.ac~configure 2004-01-13 20:52:49.000000000 +0100 ++++ Src/configure.ac 2004-01-21 01:08:08.000000000 +0100 +@@ -4,7 +4,7 @@ + AC_CONFIG_SRCDIR(main.cpp) + AC_PREREQ(2.52) + AC_CONFIG_HEADER(sysconfig.h) +- ++AM_INIT_AUTOMAKE(Frodo, 4.2, [Christian.Bauer@uni-mainz.de], Frodo) + dnl Checks for programs. + AC_PROG_CC + AC_PROG_CXX +@@ -24,10 +24,6 @@ + AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no) + AM_PATH_SDL(1.2.0, HAVE_SDL=yes, HAVE_SDL=no) + HAVE_GLADE=no +-PKG_CHECK_MODULES(GLADE, libglade-2.0 libgnomeui-2.0 >= 1.110.0, HAVE_GLADE=yes) +-if [[ $HAVE_GLADE = yes ]]; then +- AC_DEFINE(HAVE_GLADE, 1, [Glade support is enabled]) +-fi + + AC_PATH_XTRA + +--- Src/Makefile.in~configure 2004-01-13 20:52:48.000000000 +0100 ++++ Src/Makefile.in 2004-01-21 01:10:56.000000000 +0100 +@@ -16,10 +16,10 @@ + DESTDIR = + + CXX = @CXX@ +-CFLAGS = @CFLAGS@ @GLADE_CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@ ++CFLAGS = @CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@ + DEFS = @DEFS@ -DDATADIR=\"$(datadir)/frodo/\" -DBINDIR=\"$(bindir)/\" + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ @GLADE_LIBS@ ++LIBS = @LIBS@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -54,7 +54,7 @@ + $(INSTALL_PROGRAM) FrodoSC $(DESTDIR)$(bindir)/FrodoSC + $(INSTALL_PROGRAM) Frodo_GUI.tcl $(DESTDIR)$(bindir)/Frodo_GUI.tcl + $(INSTALL_DATA) ../Kernal\ ROM $(DESTDIR)$(datadir)/frodo/Kernal\ ROM +- $(INSTALL_DATA) glade/Frodo.glade $(DESTDIR)$(datadir)/frodo/Frodo.glade ++ #$(INSTALL_DATA) glade/Frodo.glade $(DESTDIR)$(datadir)/frodo/Frodo.glade + + installdirs: + $(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/frodo diff --git a/packages/frodo/frodo-4.2/frodo.desktop b/packages/frodo/frodo-4.2/frodo.desktop index e69de29bb2..4179396a52 100644 --- a/packages/frodo/frodo-4.2/frodo.desktop +++ b/packages/frodo/frodo-4.2/frodo.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Comment=C64 emulator Frodo. +Exec=Frodo +Icon=Frodo +Type=Application +Name=Frodo diff --git a/packages/frodo/frodo-4.2/frodorc b/packages/frodo/frodo-4.2/frodorc index e69de29bb2..41492fd0aa 100644 --- a/packages/frodo/frodo-4.2/frodorc +++ b/packages/frodo/frodo-4.2/frodorc @@ -0,0 +1,26 @@ +NormalCycles = 63 +BadLineCycles = 23 +CIACycles = 63 +FloppyCycles = 64 +SkipFrames = 4 +DriveType8 = DIR +DrivePath8 = /home/root/Documents +DriveType9 = D64 +DrivePath9 = +DriveType10 = D64 +DrivePath10 = +DriveType11 = D64 +DrivePath11 = +SIDType = NONE +SpritesOn = TRUE +SpriteCollisions = TRUE +Joystick1On = FALSE +Joystick2On = TRUE +JoystickSwap = FALSE +LimitSpeed = FALSE +FastReset = FALSE +CIAIRQHack = FALSE +MapSlash = TRUE +Emul1541Proc = FALSE +ShowOptions = TRUE +SIDFilters = TRUE diff --git a/packages/frodo/frodo-4.2/m4.patch b/packages/frodo/frodo-4.2/m4.patch index e69de29bb2..e7918156e2 100644 --- a/packages/frodo/frodo-4.2/m4.patch +++ b/packages/frodo/frodo-4.2/m4.patch @@ -0,0 +1,183 @@ + +# +# 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 ++#include ++#include ++#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, µ) != 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 ++#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/packages/frodo/frodo-4.2/no-pref-editor.patch b/packages/frodo/frodo-4.2/no-pref-editor.patch index e69de29bb2..b5f09ab48b 100644 --- a/packages/frodo/frodo-4.2/no-pref-editor.patch +++ b/packages/frodo/frodo-4.2/no-pref-editor.patch @@ -0,0 +1,27 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Src/main_x.h~no-pref-editor 2004-01-14 18:24:19.000000000 +0100 ++++ Src/main_x.h 2004-01-21 01:24:56.000000000 +0100 +@@ -101,15 +101,18 @@ + } + ThePrefs.Load(prefs_path); + ++#ifdef HAVE_GLADE + // Show preferences editor + if (ThePrefs.ShowEditor(true, prefs_path)) { +- ++#endif + // Create and start C64 + TheC64 = new C64; + load_rom_files(); + TheC64->Run(); + delete TheC64; ++#ifdef HAVE_GLADE + } ++#endif + } + + -- cgit v1.2.3