Add patch to build with gcc 4.3 from bug #218320, thanks to Peter Alfredsen (loki_val). Make alsa USE flag work again (bug #225919).

(Portage version: 2.1.5.5)

3 files changed, 64 insertions, 6 deletions

diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index f9e588f42e0a..a9688482c7e9 100644
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/dosbox
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.38 2007/10/22 04:40:37 mr_bones_ Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.39 2008/06/13 16:34:56 flameeyes Exp $
+
+  13 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/dosbox-0.72+gcc-4.3.patch, dosbox-0.72.ebuild:
+  Add patch to build with gcc 4.3 from bug #218320, thanks to Peter
+  Alfredsen (loki_val). Make alsa USE flag work again (bug #225919).
 
   22 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
   -files/dosbox-0.70-alsa.patch, -dosbox-0.58.ebuild, -dosbox-0.65.ebuild,
diff --git a/games-emulation/dosbox/dosbox-0.72.ebuild b/games-emulation/dosbox/dosbox-0.72.ebuild
index 4c17a72aaeee..35e4a73ba797 100644
--- a/games-emulation/dosbox/dosbox-0.72.ebuild
+++ b/games-emulation/dosbox/dosbox-0.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.72.ebuild,v 1.5 2007/10/22 04:28:46 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.72.ebuild,v 1.6 2008/06/13 16:34:56 flameeyes Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 IUSE="alsa debug hardened opengl"
 
-DEPEND="media-libs/alsa-lib
+DEPEND="alsa? ( media-libs/alsa-lib )
 	opengl? ( virtual/opengl )
 	debug? ( sys-libs/ncurses )
 	media-libs/libpng
@@ -22,7 +22,7 @@ DEPEND="media-libs/alsa-lib
 	media-libs/sdl-sound"
 
 pkg_setup() {
-	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
 		eerror "To be able to build dosbox with ALSA support you need"
 		eerror "to have built media-libs/alsa-lib with midi USE flag."
 		die "Missing midi USE flag on media-libs/alsa-lib"
@@ -30,9 +30,17 @@ pkg_setup() {
 	games_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
+		$(use_enable alsa alsa-midi) \
 		$(use_enable !hardened dynamic-x86) \
 		$(use_enable debug) \
 		$(use_enable opengl) \
diff --git a/games-emulation/dosbox/files/dosbox-0.72+gcc-4.3.patch b/games-emulation/dosbox/files/dosbox-0.72+gcc-4.3.patch
new file mode 100644
index 000000000000..bacefd420cd9
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.72+gcc-4.3.patch
@@ -0,0 +1,45 @@
+diff -ur /tmp/dosbox-0.72/src/dos/cdrom_image.cpp dosbox-0.72/src/dos/cdrom_image.cpp
+--- /tmp/dosbox-0.72/src/dos/cdrom_image.cpp	2007-08-22 13:54:35.000000000 +0200
++++ dosbox-0.72/src/dos/cdrom_image.cpp	2008-03-06 21:30:00.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include <cstdio>
+ #include <fstream>
+ #include <iostream>
+-#include <limits.h>
++#include <limits>
+ #include <sstream>
+ #include <vector>
+ #include <sys/stat.h>
+diff -ur /tmp/dosbox-0.72/src/hardware/gameblaster.cpp dosbox-0.72/src/hardware/gameblaster.cpp
+--- /tmp/dosbox-0.72/src/hardware/gameblaster.cpp	2007-01-10 11:17:37.000000000 +0100
++++ dosbox-0.72/src/hardware/gameblaster.cpp	2008-03-06 21:31:32.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include "hardware.h"
+ #include "setup.h"
+ #include "pic.h"
++#include <cstring>
+ 
+ #define LEFT	0x00
+ #define RIGHT	0x01
+diff -ur /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp dosbox-0.72/src/hardware/tandy_sound.cpp
+--- /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp	2007-06-29 20:21:12.000000000 +0200
++++ dosbox-0.72/src/hardware/tandy_sound.cpp	2008-03-06 21:32:02.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include "setup.h"
+ #include "pic.h"
+ #include "dma.h"
++#include <cstring>
+ 
+ #define DAC_CLOCK 3570000
+ #define MAX_OUTPUT 0x7fff
+diff -ur /tmp/dosbox-0.72/src/shell/shell_cmds.cpp dosbox-0.72/src/shell/shell_cmds.cpp
+--- /tmp/dosbox-0.72/src/shell/shell_cmds.cpp	2007-08-17 19:58:46.000000000 +0200
++++ dosbox-0.72/src/shell/shell_cmds.cpp	2008-03-06 21:32:47.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include "regs.h"
+ #include "../dos/drives.h"
+ #include "support.h"
++#include <cstdlib>
+ 
+ static SHELL_Cmd cmd_list[]={
+ {	"CHDIR",	1,			&DOS_Shell::CMD_CHDIR,		"SHELL_CMD_CHDIR_HELP"},