pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/gens Add support for playing back gmv movies...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/622a439e4cbc
branches:  trunk
changeset: 479477:622a439e4cbc
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Sun Aug 15 12:13:53 2004 +0000

description:
Add support for playing back gmv movies (recording of previously
played game), based on
        http://bisqwit.iki.fi/src/Gens212a-moviepatch-jyzero,bisqwit.gz
adapted to rc3 and cleaned up by me.

More information and movies can be found at
        http://bisqwit.iki.fi/jutut/nesvideos/FrontPage.html

Bump PKGREVISION.

diffstat:

 emulators/gens/Makefile         |    3 +-
 emulators/gens/distinfo         |   22 +++++--
 emulators/gens/patches/patch-aa |    2 +-
 emulators/gens/patches/patch-ab |   59 ++++++++++++++++++--
 emulators/gens/patches/patch-ac |    2 +-
 emulators/gens/patches/patch-ad |    2 +-
 emulators/gens/patches/patch-ae |    2 +-
 emulators/gens/patches/patch-af |    4 +-
 emulators/gens/patches/patch-ag |    4 +-
 emulators/gens/patches/patch-ah |   28 +++++++--
 emulators/gens/patches/patch-ai |    2 +-
 emulators/gens/patches/patch-aj |  114 ++++++++++++++++++++++++++++++++++++++-
 emulators/gens/patches/patch-ak |   42 ++++++++++++++-
 emulators/gens/patches/patch-am |   25 ++++++++
 emulators/gens/patches/patch-an |   22 +++++++
 emulators/gens/patches/patch-ao |   35 ++++++++++++
 emulators/gens/patches/patch-ap |   15 +++++
 emulators/gens/patches/patch-aq |  112 +++++++++++++++++++++++++++++++++++++++
 emulators/gens/patches/patch-ar |   21 +++++++
 emulators/gens/patches/patch-as |   52 ++++++++++++++++++
 20 files changed, 533 insertions(+), 35 deletions(-)

diffs (truncated from 757 to 300 lines):

diff -r 795447ed781e -r 622a439e4cbc emulators/gens/Makefile
--- a/emulators/gens/Makefile   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/Makefile   Sun Aug 15 12:13:53 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/26 18:23:22 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/15 12:13:53 dillo Exp $
 #
 
 DISTNAME=              gens-rc3
 PKGNAME=               gens-2.12rc3
+PKGREVISION=           1
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gens/}
 
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/distinfo
--- a/emulators/gens/distinfo   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/distinfo   Sun Aug 15 12:13:53 2004 +0000
@@ -1,15 +1,23 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/26 18:23:22 dillo Exp $
+$NetBSD: distinfo,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 SHA1 (gens-rc3.tar.gz) = 6057564665007686c9ea8df364be3220499f9917
 Size (gens-rc3.tar.gz) = 658729 bytes
 SHA1 (patch-aa) = e6a4768963e9da1799b80e775f0637eb07b2ca5c
-SHA1 (patch-ab) = cb5e049b813016aec6cd7b4c67560953a04e5bc6
+SHA1 (patch-ab) = dd38b7ebcbadc0a3881397916c2444d4a2ac2e35
 SHA1 (patch-ac) = 7c3f17c59727365ff4cf11d1a5d1c3da19943872
 SHA1 (patch-ad) = dae2ad294272f18067a640d88286ddfeb7775aaf
 SHA1 (patch-ae) = 6902f4e2abd38b2dcd946309c1321a95c3ded2b4
-SHA1 (patch-af) = 5acae2a597166b3948a56bb24b712ea49d114c8d
-SHA1 (patch-ag) = d16015ffd9e2e2d33ed229dbaa41a18c44968f47
-SHA1 (patch-ah) = a72c19bb5a521f4c26604131ff4245be4968835d
+SHA1 (patch-af) = 6e641ec6c0ae7fad6997ce70b48d417e2ec7dfd7
+SHA1 (patch-ag) = a80a828b716e3b7e342fb52c583e18305be8c627
+SHA1 (patch-ah) = e8a6264b351c4a7fb3fb1bd4dd5a482dcef763ae
 SHA1 (patch-ai) = 596fe718e5c38091a06198413bcf29b3c668571f
-SHA1 (patch-aj) = 87d2f4001bf16469430d955d7e58ffe6316595af
-SHA1 (patch-ak) = 4b06340b3702dafea12d78841f379b5255a1a74f
+SHA1 (patch-aj) = 63b9832fde01884631923e16eb0f165815d0704f
+SHA1 (patch-ak) = fbf85318880857783cd98348af627b7c6e444382
+SHA1 (patch-am) = 3e49691329cdfaf60f89136d104ec5e87cd6e255
+SHA1 (patch-an) = 94a6a857238edbf3db0daea59400f5b13fc1ed2f
+SHA1 (patch-ao) = 04bbf581f156cf3f9f119295a00071f29c2b1ab7
+SHA1 (patch-ap) = 634fa5f851b06f09c0a511c65278c002944c29d4
+SHA1 (patch-aq) = af968fb3ce22aa147ac4b47d0739db45977eacf8
+SHA1 (patch-ar) = c97b6dfd255ca64f7a5efc02e2f6b0f4b39706ec
+SHA1 (patch-as) = 9ef67fd99afa9844127f5fbca9b8524e00864aee
+SHA1 (patch-at) = 37c78682d91516e0c757993ee29b61437f8e3496
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-aa
--- a/emulators/gens/patches/patch-aa   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-aa   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/26 18:23:22 dillo Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/Makefile.in.orig  2004-05-19 22:48:47.000000000 +0200
 +++ src/gens/Makefile.in
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ab
--- a/emulators/gens/patches/patch-ab   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ab   Sun Aug 15 12:13:53 2004 +0000
@@ -1,10 +1,38 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/26 18:23:23 dillo Exp $
+$NetBSD: patch-ab,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/gtkui/support.c.orig      2004-05-18 20:04:29.000000000 +0200
 +++ src/gens/gtkui/support.c
-@@ -783,12 +783,14 @@ addIsoFilter(GtkWidget* widget)
+@@ -247,6 +247,7 @@ void
+ sync_gens_ui ()
+ {
+       GtkWidget *vsync, *stretch, *sprite_limit, *perfect_synchro;
++      GtkWidget *play_movie;
+       GtkWidget *sram_size_0;
+       GtkWidget *sram_size[4];
+ 
+@@ -277,6 +278,7 @@ sync_gens_ui ()
+       stretch = lookup_widget (gens_window, "stretch");
+       sprite_limit = lookup_widget (gens_window, "sprite_limit");
+       perfect_synchro = lookup_widget (gens_window, "perfect_synchro");
++      play_movie = lookup_widget(gens_window, "play_movie");
+ 
+       sram_size_0 = lookup_widget (gens_window, "none");
+       sram_size[0] = lookup_widget (gens_window, "_8_kb");
+@@ -393,6 +395,8 @@ sync_gens_ui ()
+                                       Sprite_Over);
+       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (perfect_synchro),
+                                       SegaCD_Accurate);
++      gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (play_movie),
++                                      MoviePlaying);
+       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (enable_sound),
+                                       Sound_Enable);
+       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (stereo),
+@@ -781,14 +785,16 @@ addIsoFilter(GtkWidget* widget)
+ {
+       GtkFileFilter* filter;
  // "SegaCD image file\0*.bin;*.iso;*.raw\0All files\0*.*\0\0"
-       const char* bin = "*.[bb][iI][nN]";
+-      const char* bin = "*.[bb][iI][nN]";
++      const char* bin = "*.[bB][iI][nN]";
        const char* iso = "*.[iI][sS][oO]";
 +      const char* chd = "*.[cC][hH][dD]";
        const char* raw = "*.[rR][aA][wW]";
@@ -17,7 +45,7 @@
        gtk_file_filter_add_pattern (filter, raw);
        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
  }
-@@ -803,6 +805,7 @@ addRomsFilter(GtkWidget* widget)
+@@ -803,6 +809,7 @@ addRomsFilter(GtkWidget* widget)
        const char* gen = "*.[gG][eE][nN]";
        const char* _32x = "*.32[xX]";
        const char* iso = "*.[iI][sS][oO]";
@@ -25,7 +53,7 @@
        const char* raw = "*.[rR][aA][wW]";
        const char* zip = "*.[zZ][iI][pP]";
        const char* gz ="*.[gG][zZ]";
-@@ -816,6 +819,7 @@ addRomsFilter(GtkWidget* widget)
+@@ -816,6 +823,7 @@ addRomsFilter(GtkWidget* widget)
        gtk_file_filter_add_pattern (filter, gen);
        gtk_file_filter_add_pattern (filter, _32x);
        gtk_file_filter_add_pattern (filter, iso);
@@ -33,7 +61,7 @@
        gtk_file_filter_add_pattern (filter, raw);
        gtk_file_filter_add_pattern (filter, zip);
        gtk_file_filter_add_pattern (filter, gz);
-@@ -842,6 +846,7 @@ addRomsFilter(GtkWidget* widget)
+@@ -842,6 +850,7 @@ addRomsFilter(GtkWidget* widget)
        filter = gtk_file_filter_new ();
      gtk_file_filter_set_name (filter, "SegaCD image");
        gtk_file_filter_add_pattern (filter, iso);
@@ -41,3 +69,22 @@
        gtk_file_filter_add_pattern (filter, raw);
        gtk_file_filter_add_pattern (filter, bin);
        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
+@@ -852,6 +861,18 @@ addRomsFilter(GtkWidget* widget)
+       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
+ }
+ 
++void
++addGmvFilter(GtkWidget* widget)
++{
++      GtkFileFilter* filter;
++      const char* gmv = "*.[gG][mM][vV]";
++      
++      filter = gtk_file_filter_new ();
++      gtk_file_filter_set_name (filter, "gens movie file");
++      gtk_file_filter_add_pattern (filter, gmv);
++      gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
++}
++
+ GtkWidget*
+ create_file_chooser_dialog(const char* title, GtkFileChooserAction action)
+ {
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ac
--- a/emulators/gens/patches/patch-ac   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ac   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/26 18:23:23 dillo Exp $
+$NetBSD: patch-ac,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/segacd/cd_aspi.c.orig     2004-05-18 22:34:00.000000000 +0200
 +++ src/gens/segacd/cd_aspi.c
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ad
--- a/emulators/gens/patches/patch-ad   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ad   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-ad,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/segacd/cd_file.c.orig     2004-05-18 22:34:00.000000000 +0200
 +++ src/gens/segacd/cd_file.c
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ae
--- a/emulators/gens/patches/patch-ae   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ae   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-ae,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/segacd/cd_file.h.orig     2004-03-14 15:34:33.000000000 +0100
 +++ src/gens/segacd/cd_file.h
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-af
--- a/emulators/gens/patches/patch-af   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-af   Sun Aug 15 12:13:53 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-af,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
---- src/gens/util/chd.c.orig   2004-06-25 19:55:16.000000000 +0200
+--- src/gens/util/chd.c.orig   2004-08-15 11:35:14.000000000 +0200
 +++ src/gens/util/chd.c
 @@ -0,0 +1,400 @@
 +/*
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ag
--- a/emulators/gens/patches/patch-ag   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ag   Sun Aug 15 12:13:53 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-ag,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
---- src/gens/util/chd.h.orig   2004-06-25 19:55:16.000000000 +0200
+--- src/gens/util/chd.h.orig   2004-08-15 11:35:14.000000000 +0200
 +++ src/gens/util/chd.h
 @@ -0,0 +1,94 @@
 +#ifndef HAD_CHD_H
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ah
--- a/emulators/gens/patches/patch-ah   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ah   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-ah,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/util/rom.c.orig   2004-05-18 22:33:59.000000000 +0200
 +++ src/gens/util/rom.c
@@ -38,14 +38,28 @@
    else
      {
        strcpy (zname, Name);
-@@ -402,6 +417,10 @@ Get_Rom ()
-       filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
+@@ -389,7 +404,7 @@ Get_Rom ()
+   GtkWidget *widget;
+   gint res;
+   char Name[2048];
+-  gchar *filename;
++  gchar *filename = NULL;
+   int sys;
+ 
+   widget =
+@@ -403,9 +418,12 @@ Get_Rom ()
      }
    gtk_widget_destroy (widget);
-+  if (res != GTK_RESPONSE_OK)
+ 
+-  strncpy (Name, filename, 2048);
+-  g_free (filename);
+-  Free_Rom (Game);
++  if (filename)
 +    {
-+      return;
++      strncpy (Name, filename, 2048);
++      g_free (filename);
++      Free_Rom (Game);
 +    }
  
-   strncpy (Name, filename, 2048);
-   g_free (filename);
+   sys = Detect_Format (Name);
+ 
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-ai
--- a/emulators/gens/patches/patch-ai   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-ai   Sun Aug 15 12:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-ai,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/util/unzip.h.orig 2004-03-14 15:33:14.000000000 +0100
 +++ src/gens/util/unzip.h
diff -r 795447ed781e -r 622a439e4cbc emulators/gens/patches/patch-aj
--- a/emulators/gens/patches/patch-aj   Sun Aug 15 12:07:02 2004 +0000
+++ b/emulators/gens/patches/patch-aj   Sun Aug 15 12:13:53 2004 +0000
@@ -1,8 +1,32 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/07/26 18:23:25 dillo Exp $
+$NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
 
 --- src/gens/emulator/g_main.c.orig    2004-05-18 22:34:00.000000000 +0200
 +++ src/gens/emulator/g_main.c
-@@ -394,6 +394,13 @@ update_SDL_events ()
+@@ -55,6 +55,23 @@ int Intro_Style = 2;
+ int SegaCD_Accurate = 0;
+ int Kaillera_Client_Running = 0;
+ 
++int NbRerecord=0;
++char MovieFileName[1024];
++int MoviePlaying=0;
++int FrameCount=0;
++unsigned MovieLastFrame=0;
++
++FILE *MovieFile;
++
++struct type_MovieFrame
++{
++       char P1;
++       char P2;
++       char PX;
++};
++
++struct type_MovieFrame *MovieData = NULL;
++
+ static int Gens_Running = 0;
+ 
+ void
+@@ -394,6 +411,13 @@ update_SDL_events ()
  
              break;
  
@@ -16,7 +40,7 @@
            case SDLK_v:
              if (KMOD_CTRL & mod)
                {
-@@ -429,14 +436,14 @@ update_SDL_events ()
+@@ -429,14 +453,14 @@ update_SDL_events ()



Home | Main Index | Thread Index | Old Index