Update scummvm to 0.3.0b

PR:		46150
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net> (maintainer)

4 files changed, 11 insertions, 58 deletions

diff --git a/emulators/scummvm/files/patch-Makefile b/emulators/scummvm/files/patch-Makefile
deleted file mode 100644
index 2b95d83fc14c..000000000000
--- a/emulators/scummvm/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Tue May 14 17:11:37 2002
-+++ Makefile	Tue May 14 17:12:23 2002
-@@ -1,14 +1,13 @@
- # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
- 
--CC      = g++
--CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-+CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
- DEFINES = -DUNIX
- LDFLAGS :=
--INCLUDES:= `sdl-config --cflags` -I./ -I./sound
-+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
- CPPFLAGS= $(DEFINES) $(INCLUDES)
- 
- # Add -lmad for -DCOMPRESSED_SOUND_FILE
--LIBS	= `sdl-config --libs` -lncurses
-+LIBS	= `sdl11-config --libs` -lncurses
- 
- OBJS	= sdl.o
- 
diff --git a/emulators/scummvm/files/patch-Makefile.common b/emulators/scummvm/files/patch-Makefile.common
deleted file mode 100644
index 4433617646c9..000000000000
--- a/emulators/scummvm/files/patch-Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.common.orig	Tue May 14 17:14:18 2002
-+++ Makefile.common	Tue May 14 17:14:28 2002
-@@ -19,12 +19,12 @@
- 	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
- 
- .cpp.o:
--	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-+	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
- 
- all: scummvm$(EXEEXT)
- 
- scummvm$(EXEEXT): $(OBJS)
--	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
- 
- clean:
- 	rm -f $(OBJS) scummvm$(EXEEXT)
diff --git a/emulators/scummvm/files/patch-Makefile.x11 b/emulators/scummvm/files/patch-Makefile.x11
deleted file mode 100644
index f0fc01a326d9..000000000000
--- a/emulators/scummvm/files/patch-Makefile.x11
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.x11.orig	Sat Apr 27 07:06:27 2002
-+++ Makefile.x11	Tue May 14 17:12:04 2002
-@@ -1,14 +1,13 @@
- # $Header: /cvsroot/scummvm/scummvm/Makefile.x11,v 1.4 2002/04/27 11:06:27 fingolfin Exp $
- 
--CC      = gcc
--CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
-+CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
- DEFINES = -DUNIX_X11
--LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
--INCLUDES:= -I/usr/X11R6/include -I./ -I./sound -I/usr/local/include
-+LDFLAGS := -L${X11BASE}/lib -L${LOCALBASE}/lib
-+INCLUDES:= -I${X11BASE}/include -I./ -I./sound -I${LOCALBASE}/include
- CPPFLAGS= $(DEFINES) $(INCLUDES)
- 
- # Add -lmad for -DCOMPRESSED_SOUND_FILE
--LIBS	= -lXext -lX11 -lncurses -lm -lmad -lpthread
-+LIBS	= -lXext -lX11 -lncurses -lm -lmad ${PTHREAD_LIBS}
- 
- OBJS	= x11.o
- 
diff --git a/emulators/scummvm/files/patch-sound::mixer.h b/emulators/scummvm/files/patch-sound::mixer.h
new file mode 100644
index 000000000000..35b749684e18
--- /dev/null
+++ b/emulators/scummvm/files/patch-sound::mixer.h
@@ -0,0 +1,11 @@
+--- sound/mixer.h.orig	Wed Jan  1 13:21:10 2003
++++ sound/mixer.h	Wed Jan  1 13:21:41 2003
+@@ -25,6 +25,8 @@
+ 
+ #include <stdio.h>
+ 
++#undef USE_MAD
++
+ #ifdef USE_MAD
+ #include <mad.h>
+ #endif