diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
| commit | 0d2725682b8325a08b11592d11062997bb9dc7f2 (patch) | |
| tree | 46ab0c86563bfc2fbab1ecc5f9dadffb47afe737 /games/vdrift | |
| parent | Update to 0.32 (diff) | |
- Update devel/sdl12 to version 1.2.11. Now we employ stock SDL directory
structure (i.e. include/SDL for includes and sdl-config for configuration
binary)
- Update graphics/sdl_ttf to version 2.0.8
- Update graphics/sdl_image to version 1.2.5
- Update audio/sdl_mixer to version 1.2.7
- Update net/sdl_net to version 1.2.6
- Update Mk/bsd.sdl.mk accordingly
- Fix dependent ports to fit the new directory structure and avoid several
API breakages
- Bump up portrevisions for all dependent ports to allow them to be upgraded
by portupgrade/portmaster etc tools
Approved by: kris (portmgr), sem (mentor)
Notes
Notes:
svn path=/head/; revision=173460
Diffstat (limited to 'games/vdrift')
| -rw-r--r-- | games/vdrift/Makefile | 4 | ||||
| -rw-r--r-- | games/vdrift/files/patch-SConstruct | 12 | ||||
| -rw-r--r-- | games/vdrift/files/patch-src_sound.cpp | 14 |
3 files changed, 23 insertions, 7 deletions
diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index 05832acb7185..32b8d5822adb 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdrift PORTVERSION= 20060708 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -61,10 +62,7 @@ BROKEN= Does not compile on sparc64 .endif post-patch: - @${FIND} ${WRKSRC}/src/* -type f -exec ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' "{}" \; - @${FIND} ${WRKSRC}/include/* -type f -exec ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' "{}" \; @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/src/SConscript @${REINPLACE_CMD} -e "s|'openal'|'openal','alut'|g" ${WRKSRC}/SConstruct do-build: diff --git a/games/vdrift/files/patch-SConstruct b/games/vdrift/files/patch-SConstruct index 89d701992c1d..03c735ce9304 100644 --- a/games/vdrift/files/patch-SConstruct +++ b/games/vdrift/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct Fri Jul 21 16:43:04 2006 -+++ SConstruct Fri Jul 21 16:43:49 2006 -@@ -42,7 +42,7 @@ +--- SConstruct.orig Sun Jul 9 03:05:30 2006 ++++ SConstruct Tue Sep 12 19:16:12 2006 +@@ -42,10 +42,10 @@ env = Environment(ENV = os.environ, CPPPATH = ['#include',LOCALBASE + '/include', LOCALBASE + '/include/AL',X11BASE + '/include'], LIBPATH = ['.', '#lib', LOCALBASE + '/lib', X11BASE + '/lib'], @@ -8,4 +8,8 @@ + LINKFLAGS = ['-pthread','-lintl'], options = opts) - check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL11/SDL.h', 'SDL11/SDL_image.h', 'SDL11/SDL_net.h'] +- check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL11/SDL.h', 'SDL11/SDL_image.h', 'SDL11/SDL_net.h'] ++ check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_net.h'] + + env.Replace(CC = os.environ['CC']) + env.Replace(CXX = os.environ['CXX']) diff --git a/games/vdrift/files/patch-src_sound.cpp b/games/vdrift/files/patch-src_sound.cpp new file mode 100644 index 000000000000..8819c41a060a --- /dev/null +++ b/games/vdrift/files/patch-src_sound.cpp @@ -0,0 +1,14 @@ +--- src/sound.cpp.orig Tue Sep 12 19:39:38 2006 ++++ src/sound.cpp Tue Sep 12 19:41:19 2006 +@@ -282,9 +282,9 @@ + alutLoadWAVFile((ALbyte*)(filename).c_str(), &format, &data, &size, &freq); + #else + #ifdef OLD_OPENAL +- alutLoadWAVFile((ALbyte*)(filename).c_str(), &format, &data, &size, &freq, &loop); ++ alutLoadWAVFile(filename.c_str(), &format, &data, &size, &freq, &loop); + #else +- data = alutLoadMemoryFromFile((ALbyte*)(filename).c_str(), &format, &size, &freq); ++ data = alutLoadMemoryFromFile(filename.c_str(), &format, &size, &freq); + #endif + #endif + //bool err = LoadWave(filename, &format, &data, &size, &freq, &loop); |