rpms/fakenes/devel fakenes-0.5.9-beta3-gcc43.patch, NONE,
1.1 fakenes-0.5.9-beta3-openal-build.patch, NONE, 1.1 .cvsignore,
1.2, 1.3 fakenes-0.5.8-driver-switch.patch, 1.1,
1.2 fakenes.spec, 1.6, 1.7 sources, 1.2,
1.3 fakenes-0.5.8-alutinit.patch, 1.1, NONE
Hans de Goede
jwrdegoede at rpmfusion.org
Sun Oct 25 14:06:48 CET 2009
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31766
Modified Files:
.cvsignore fakenes-0.5.8-driver-switch.patch fakenes.spec
sources
Added Files:
fakenes-0.5.9-beta3-gcc43.patch
fakenes-0.5.9-beta3-openal-build.patch
Removed Files:
fakenes-0.5.8-alutinit.patch
Log Message:
* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.9-0.1.beta3
- New upstream release 0.5.9-beta3
fakenes-0.5.9-beta3-gcc43.patch:
--- NEW FILE fakenes-0.5.9-beta3-gcc43.patch ---
--- fakenes-0.5.9-beta3/src/audio.cpp~ 2007-06-22 04:26:25.000000000 +0200
+++ fakenes-0.5.9-beta3/src/audio.cpp 2009-10-25 10:45:45.000000000 +0100
@@ -7,6 +7,7 @@
You must read and accept the license prior to use. */
#include <allegro.h>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <vector>
--- fakenes-0.5.9-beta3/src/audio.cpp~ 2009-10-25 10:50:09.000000000 +0100
+++ fakenes-0.5.9-beta3/src/audio.cpp 2009-10-25 10:50:40.000000000 +0100
@@ -6,14 +6,16 @@
This is free software. See 'LICENSE' for details.
You must read and accept the license prior to use. */
+/* This includes c++ <vector> which uses min and max internally, which get
+ defined as macros in allegro.h, so include this before allegro.h */
+#include "audio_int.h"
#include <allegro.h>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <vector>
#include "apu.h"
#include "audio.h"
-#include "audio_int.h"
#include "audiolib.h"
#include "common.h"
#include "debug.h"
--- fakenes-0.5.9-beta3/src/audiolib.cpp~ 2007-06-16 21:27:27.000000000 +0200
+++ fakenes-0.5.9-beta3/src/audiolib.cpp 2009-10-25 10:51:01.000000000 +0100
@@ -6,11 +6,13 @@
This is free software. See 'LICENSE' for details.
You must read and accept the license prior to use. */
+/* This includes c++ <vector> which uses min and max internally, which get
+ defined as macros in allegro.h, so include this before allegro.h */
+#include "audio_int.h"
#include <allegro.h>
#include <cstdlib>
#include <cstring>
#include "audio.h"
-#include "audio_int.h"
#include "audiolib.h"
#include "common.h"
#include "debug.h"
fakenes-0.5.9-beta3-openal-build.patch:
--- NEW FILE fakenes-0.5.9-beta3-openal-build.patch ---
diff -up fakenes-0.5.9-beta3/build/openal.cbd~ fakenes-0.5.9-beta3/build/openal.cbd
--- fakenes-0.5.9-beta3/build/openal.cbd~ 2007-06-14 12:29:07.000000000 +0200
+++ fakenes-0.5.9-beta3/build/openal.cbd 2009-10-25 11:07:36.000000000 +0100
@@ -23,7 +23,7 @@ CFLAGS += ' -DUSE_OPENAL'
# --
do ifplat unix
- LDFLAGS += ' `openal-config --libs`'
+ LDFLAGS += ' `pkg-config openal --libs`'
else
LDFLAGS += ' -lOpenAL32'
done
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Jul 2008 11:29:16 -0000 1.2
+++ .cvsignore 25 Oct 2009 13:06:47 -0000 1.3
@@ -1 +1 @@
-fakenes-0.5.8.tar.bz2
+fakenes-0.5.9-beta3.tar.gz
fakenes-0.5.8-driver-switch.patch:
Index: fakenes-0.5.8-driver-switch.patch
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes-0.5.8-driver-switch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fakenes-0.5.8-driver-switch.patch 24 Jul 2008 11:29:16 -0000 1.1
+++ fakenes-0.5.8-driver-switch.patch 25 Oct 2009 13:06:47 -0000 1.2
@@ -1,10 +1,12 @@
---- fakenes-0.5.8/src/gui.c.driver 2006-04-26 15:20:24.000000000 +0200
-+++ fakenes-0.5.8/src/gui.c 2006-08-11 22:30:57.000000000 +0200
-@@ -237,55 +237,58 @@
- TOGGLE_MENU_ITEM(audio_channels_menu_extended_2, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_2));
- TOGGLE_MENU_ITEM(audio_channels_menu_extended_3, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_3));
+diff -ur fakenes-0.5.9-beta3/src/gui.c fakenes-0.5.9-beta3.new/src/gui.c
+--- fakenes-0.5.9-beta3/src/gui.c 2007-06-25 18:43:10.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/gui.c 2009-10-25 10:38:18.000000000 +0100
+@@ -206,55 +206,59 @@
+ TOGGLE_MENU_ITEM(audio_output_buffer_menu_175ms, (audio_options.buffer_length_ms_hint == 175));
+ TOGGLE_MENU_ITEM(audio_output_buffer_menu_200ms, (audio_options.buffer_length_ms_hint == 200));
-+ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
++ TOGGLE_MENU_ITEM(video_driver_menu_safe, (menu_video_driver == GFX_SAFE));
++ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
+
#ifdef ALLEGRO_DOS
@@ -82,33 +84,79 @@
#endif /* USE_ALLEGROGL */
---- fakenes-0.5.8/src/video.c.driver 2006-04-24 22:27:32.000000000 +0200
-+++ fakenes-0.5.8/src/video.c 2006-08-11 22:29:11.000000000 +0200
-@@ -62,7 +62,13 @@
+@@ -2562,6 +2562,7 @@ static int video_menu_color (void)
+ return (D_CLOSE); \
+ }
+
++DRIVER_MENU_HANDLER(safe, GFX_SAFE)
+ DRIVER_MENU_HANDLER(automatic, GFX_AUTODETECT)
+
+ #ifdef ALLEGRO_DOS
+diff -ur fakenes-0.5.9-beta3/src/include/gui/menus.h fakenes-0.5.9-beta3.new/src/include/gui/menus.h
+--- fakenes-0.5.9-beta3/src/include/gui/menus.h 2007-06-19 10:20:26.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/include/gui/menus.h 2009-10-25 10:36:00.000000000 +0100
+@@ -582,6 +582,7 @@
+
+ #endif /* !ALLEGRO_UNIX */
+
++DEFINE_MENU_CALLBACK(video_driver_menu_safe);
+ DEFINE_MENU_CALLBACK(video_driver_menu_automatic);
+
+ #ifdef USE_ALLEGROGL
+@@ -594,6 +595,7 @@
+
+ static const MENU video_driver_menu_base[] =
+ {
++ { "&Safe", video_driver_menu_safe, NULL, 0, NULL },
+ { "&Automatic", video_driver_menu_automatic, NULL, 0, NULL },
+ MENU_SPLITTER,
+
+diff -ur fakenes-0.5.9-beta3/src/include/video.h fakenes-0.5.9-beta3.new/src/include/video.h
+--- fakenes-0.5.9-beta3/src/include/video.h 2007-06-21 23:39:36.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/include/video.h 2009-10-25 10:31:20.000000000 +0100
+@@ -50,7 +50,7 @@
+ extern BOOL video_force_fullscreen;
+ extern int video_cached_color_depth; /* Read only. */
+
+-extern int video_driver;
++extern int menu_video_driver;
+
+ extern BITMAP *base_video_buffer;
+ extern BITMAP *video_buffer;
+Only in fakenes-0.5.9-beta3.new/src/include: video.h~
+diff -ur fakenes-0.5.9-beta3/src/video.c fakenes-0.5.9-beta3.new/src/video.c
+--- fakenes-0.5.9-beta3/src/video.c 2007-06-21 23:39:36.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/video.c 2009-10-25 10:39:47.000000000 +0100
+@@ -62,14 +62,21 @@
BOOL video_force_fullscreen = FALSE;
int video_cached_color_depth = 0; /* Read only. */
--int video_driver = 0;
+/* 2 versions of video driver "video_driver" contains the one actually used,
-+ "menu_video_driver" contains the one configured by the user from the
-+ menu, this can be different from the one actually used, because hot
-+ switching between regular allegro drivers and alleggl drivers is not
-+ supported. */
-+static int video_driver = 0;
-+int menu_video_driver = 0;
++ "menu_video_driver" contains the one configured by the user from the
++ menu, this can be different from the one actually used, because hot
++ switching between regular allegro drivers and alleggl drivers is not
++ supported. */
+ #ifdef ALLEGRO_DOS
+ /* We use autodetect under DOS because I think the safe driver defaults to like 320x200 or something which is too small
+ for the new GUI even with the smallest font. */
+-int video_driver = GFX_AUTODETECT;
++static int video_driver = GFX_AUTODETECT;
++int menu_video_driver = GFX_AUTODETECT;
+ #else
+ /* Under Windowed operating systems, resolutions above or equal to 640x480 are always present and therefor we can go ahead
+ and use the safe driver for better compatibility without hampering the GUI at the same time. */
+-int video_driver = GFX_SAFE;
++static int video_driver = GFX_SAFE;
++int menu_video_driver = GFX_SAFE;
+ #endif
BITMAP *base_video_buffer = NULL;
- BITMAP *video_buffer = NULL;
-@@ -139,6 +145,7 @@
- int width, height;
- int result;
- const CHAR *font_file;
-+ static BOOL firsttime = TRUE;
-
- log_printf ("VIDEO: Entering video_init().");
-
-@@ -152,7 +159,15 @@
+@@ -143,9 +150,19 @@
+ void video_load_config (void)
+ {
++ static BOOL firsttime = TRUE;
++
log_printf ("VIDEO: Loading configuration.");
- video_driver = get_config_id ("video", "driver", video_driver);
@@ -124,8 +172,8 @@
screen_width = get_config_int ("video", "screen_width", screen_width);
screen_height = get_config_int ("video", "screen_height", screen_height);
color_depth = get_config_int ("video", "color_depth", color_depth);
-@@ -576,7 +591,7 @@
-
+@@ -169,7 +186,7 @@
+ {
log_printf ("VIDEO: Saving configuration.");
- set_config_id ("video", "driver", video_driver);
@@ -133,7 +181,47 @@
set_config_int ("video", "screen_width", screen_width);
set_config_int ("video", "screen_height", screen_height);
set_config_int ("video", "color_depth", color_depth);
-@@ -1639,13 +1654,29 @@
+@@ -191,7 +208,7 @@
+
+ int video_init (void)
+ {
+- int driver;
++ int driver = video_driver;
+ int width, height;
+ int result;
+ const CHAR *font_file;
+@@ -222,11 +239,13 @@
+ else
+ has_desktop = FALSE;
+
+- /* We want to switch from the safe driver to an automatic driver when entering fullscreen modes. */
+- if((video_driver == GFX_SAFE) && video_force_fullscreen)
+- driver = GFX_AUTODETECT;
+-
+- if(video_driver == GFX_AUTODETECT ) {
++ if(video_driver == GFX_SAFE) {
++ /* We want to switch from the safe driver to an automatic driver when entering fullscreen modes. */
++ if(video_force_fullscreen)
++ driver = GFX_AUTODETECT_FULLSCREEN;
++ else
++ driver = GFX_SAFE;
++ } else { /* video_driver == GFX_AUTODETECT */
+ /* Determine which automatic driver to use. */
+ if(video_force_fullscreen)
+ driver = GFX_AUTODETECT_FULLSCREEN;
+@@ -235,11 +254,7 @@
+ else
+ driver = GFX_AUTODETECT;
+ }
+- else
+- driver = video_driver;
+ }
+- else
+- driver = video_driver;
+
+ #ifdef USE_ALLEGROGL
+
+@@ -1644,13 +1659,29 @@
void video_set_driver (int driver)
{
int old_driver;
@@ -165,26 +253,17 @@
old_driver = gfx_driver -> id;
-@@ -1673,6 +1704,11 @@
+@@ -1678,6 +1709,13 @@
preserve_video_buffer = FALSE;
preserve_palette = FALSE;
+
-+ if (video_driver == GFX_AUTODETECT)
-+ menu_video_driver = GFX_AUTODETECT;
++ if (video_driver == GFX_SAFE)
++ menu_video_driver = GFX_SAFE;
++ else if (video_driver == GFX_AUTODETECT)
++ menu_video_driver = GFX_AUTODETECT;
+ else
-+ menu_video_driver = gfx_driver -> id;
++ menu_video_driver = gfx_driver -> id;
}
---- fakenes-0.5.8/src/include/video.h.driver 2006-04-24 02:54:48.000000000 +0200
-+++ fakenes-0.5.8/src/include/video.h 2006-08-11 22:29:11.000000000 +0200
-@@ -49,7 +49,7 @@
- BOOL video_force_fullscreen;
- int video_cached_color_depth; /* Read only. */
-
--int video_driver;
-+int menu_video_driver;
-
- BITMAP *base_video_buffer;
- BITMAP *video_buffer;
Index: fakenes.spec
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fakenes.spec 24 Oct 2009 11:39:41 -0000 1.6
+++ fakenes.spec 25 Oct 2009 13:06:47 -0000 1.7
@@ -1,15 +1,18 @@
+%define beta beta3
+
Name: fakenes
-Version: 0.5.8
-Release: 9%{?dist}
+Version: 0.5.9
+Release: 0.1.%{beta}%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
URL: http://fakenes.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{beta}.tar.gz
Source1: %{name}.desktop
Patch0: fakenes-0.5.8-menu-exit.patch
Patch1: fakenes-0.5.8-driver-switch.patch
-Patch2: fakenes-0.5.8-alutinit.patch
+Patch2: fakenes-0.5.9-beta3-gcc43.patch
+Patch3: fakenes-0.5.9-beta3-openal-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
@@ -24,10 +27,11 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta}
%patch0 -p1 -z .menu
%patch1 -p1 -z .driver
-%patch2 -p1 -z .alutinit
+%patch2 -p1 -z .gcc43
+%patch3 -p1 -z .openal-build
sed -i 's/\r//' docs/faq.html
@@ -72,6 +76,9 @@
%changelog
+* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.9-0.1.beta3
+- New upstream release 0.5.9-beta3
+
* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.5.8-9
- rebuild for new openal
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Jul 2008 11:29:16 -0000 1.2
+++ sources 25 Oct 2009 13:06:47 -0000 1.3
@@ -1 +1 @@
-bc2650c42c63f18326d03e932245a787 fakenes-0.5.8.tar.bz2
+48330653c50747d082ee13958cbf2a2c fakenes-0.5.9-beta3.tar.gz
--- fakenes-0.5.8-alutinit.patch DELETED ---
More information about the rpmfusion-commits
mailing list