cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't force the audio format, let SDL do conversions

Browse Source 
ok pvalchev
This commit is contained in:
jakemsr 2009-01-25 01:27:23 +00:00
parent 7398d6cd1a
commit 99623fb833
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/amph/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2007/09/15 18:01:00 simon Exp $
# $OpenBSD: Makefile,v 1.14 2009/01/25 01:27:23 jakemsr Exp $
COMMENT= jump'n run game with unique video effects
VERSION= 0.8.10
DVERSION= 0.8.6
DISTNAME= amphetamine-${VERSION}
PKGNAME= amph-${VERSION}p0
PKGNAME= amph-${VERSION}p1
CATEGORIES= games x11
EXTRACT_SUFX= .tar.bz2

10
games/amph/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.6 2003/01/21 21:59:51 pvalchev Exp $
--- Makefile.orig Mon Mar 25 12:11:27 2002
+++ Makefile Tue Jan 21 14:50:05 2003
$OpenBSD: patch-Makefile,v 1.7 2009/01/25 01:27:23 jakemsr Exp $
--- Makefile.orig Mon Mar 25 11:11:27 2002
+++ Makefile Thu Jan 22 02:39:13 2009
@@ -3,14 +3,13 @@
#===============
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.6 2003/01/21 21:59:51 pvalchev Exp $
SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
#=======================================================
@@ -26,19 +25,19 @@ SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADE
@@ -26,19 +25,19 @@ SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS}
# makemake variables
@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile,v 1.6 2003/01/21 21:59:51 pvalchev Exp $
%.o : %.cpp
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
@@ -47,7 +46,7 @@ CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-
@@ -47,7 +46,7 @@ CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-f
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
# C preprocessor (C, C++, FORTRAN)

23
games/amph/patches/patch-src_SndSys_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_SndSys_cpp,v 1.1 2009/01/25 01:27:23 jakemsr Exp $
--- src/SndSys.cpp.orig Sun Mar 24 00:49:09 2002
+++ src/SndSys.cpp Sat Jan 24 04:52:38 2009
@@ -16,7 +16,7 @@ void Mix_Audio(void *udata, Uint8 *stream, int len)
int InitializeSoundSystem()
{
- SDL_AudioSpec wanted, obtained;
+ SDL_AudioSpec wanted;
/* Set the audio format */
// Not all sounds are of the same sampling rate which is why
@@ -28,8 +28,8 @@ int InitializeSoundSystem()
wanted.callback = Mix_Audio;
wanted.userdata = NULL;
- /* Open the audio device, forcing the desired format */
- if ( SDL_OpenAudio(&wanted, &obtained) < 0 ) {
+ /* Open the audio device, allowing SDL to apply conversions */
+ if ( SDL_OpenAudio(&wanted, NULL) < 0 ) {
fprintf(stderr, "InitSoundSystem: Couldn't open audio: %s\n", SDL_GetError());
fprintf(stderr, "Sound was disabled. \n");
return(-1);