rpms/dosbox/devel dosbox-gcc43.patch, NONE, 1.1 dosbox.spec, 1.28, 1.29
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Fri Feb 22 15:42:33 UTC 2008
Author: awjb
Update of /cvs/pkgs/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27941
Modified Files:
dosbox.spec
Added Files:
dosbox-gcc43.patch
Log Message:
- fix gcc43 build (#433990) with patch from Erik van Pienbroek
- add BR SDL_sound-devel
dosbox-gcc43.patch:
--- NEW FILE dosbox-gcc43.patch ---
--- dosbox-0.72/src/hardware/tandy_sound.cpp.orig 2008-02-22 14:58:41.021089870 +0100
+++ dosbox-0.72/src/hardware/tandy_sound.cpp 2008-02-22 14:58:51.796092095 +0100
@@ -20,6 +20,7 @@
Based of sn76496.c of the M.A.M.E. project
*/
+#include <string.h>
#include <math.h>
#include "dosbox.h"
#include "inout.h"
--- dosbox-0.72/src/hardware/gameblaster.cpp.orig 2008-02-22 14:57:23.142093744 +0100
+++ dosbox-0.72/src/hardware/gameblaster.cpp 2008-02-22 14:58:10.029094022 +0100
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <string.h>
#include <math.h>
#include "dosbox.h"
#include "inout.h"
--- dosbox-0.72/src/shell/shell_cmds.cpp.orig 2008-02-22 15:01:54.536092009 +0100
+++ dosbox-0.72/src/shell/shell_cmds.cpp 2008-02-22 15:02:06.433091061 +0100
@@ -18,6 +18,7 @@
/* $Id: shell_cmds.cpp,v 1.78 2007/08/17 17:58:46 qbix79 Exp $ */
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <vector>
--- dosbox-0.72/src/dos/cdrom_image.cpp.orig 2008-02-22 15:11:07.059090763 +0100
+++ dosbox-0.72/src/dos/cdrom_image.cpp 2008-02-22 15:11:19.471092211 +0100
@@ -26,6 +26,7 @@
#include <limits.h>
#include <sstream>
#include <vector>
+#include <limits>
#include <sys/stat.h>
#include "cdrom.h"
#include "drives.h"
Index: dosbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dosbox.spec 18 Feb 2008 20:19:01 -0000 1.28
+++ dosbox.spec 22 Feb 2008 15:41:51 -0000 1.29
@@ -1,6 +1,6 @@
Name: dosbox
Version: 0.72
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: x86/DOS emulator with sound and graphics
@@ -10,11 +10,13 @@
Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: dosbox.desktop
Source2: dosbox.png
+Patch0: dosbox-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libpng-devel
BuildRequires: SDL-devel
BuildRequires: SDL_net-devel
+BuildRequires: SDL_sound-devel
BuildRequires: desktop-file-utils
BuildRequires: alsa-lib-devel
BuildRequireS: libGLU-devel
@@ -72,6 +74,11 @@
%changelog
+* Fri Feb 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.72-4
+- fix gcc43 build (#433990) with patch from Erik van Pienbroek
+- add BR SDL_sound-devel
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.72-3
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list