r8916 - packages/trunk/vdrift/debian/patches
Gonéri Le Bouder
goneri at alioth.debian.org
Sun Feb 22 14:31:54 UTC 2009
Author: goneri
Date: 2009-02-22 14:31:54 +0000 (Sun, 22 Feb 2009)
New Revision: 8916
Added:
packages/trunk/vdrift/debian/patches/no_SDL_net.diff
Removed:
packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff
packages/trunk/vdrift/debian/patches/fix_scons.diff
packages/trunk/vdrift/debian/patches/scon_link_bullet.diff
Modified:
packages/trunk/vdrift/debian/patches/series
Log:
refresh patches for the new release
Deleted: packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff 2009-02-22 13:40:26 UTC (rev 8915)
+++ packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff 2009-02-22 14:31:54 UTC (rev 8916)
@@ -1,11 +0,0 @@
---- vdrift-2008.08.05.dfsg.orig/bullet-2.66/CMakeLists.txt
-+++ vdrift-2008.08.05.dfsg/bullet-2.66/CMakeLists.txt
-@@ -2,6 +2,6 @@
-
- IF (NOT CMAKE_BUILD_TYPE)
- SET(CMAKE_BUILD_TYPE "Release")
--ENDIF (NOT CMAKE_BUILD_TYPE)
-+ENDIF (NOT CMAKE_BUILD_TYPE)
-
--SUBDIRS(src Demos Extras)
-+SUBDIRS(src)
Deleted: packages/trunk/vdrift/debian/patches/fix_scons.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/fix_scons.diff 2009-02-22 13:40:26 UTC (rev 8915)
+++ packages/trunk/vdrift/debian/patches/fix_scons.diff 2009-02-22 14:31:54 UTC (rev 8916)
@@ -1,25 +0,0 @@
---- vdrift-2008.08.05.dfsg.orig/src/SConscript
-+++ vdrift-2008.08.05.dfsg/src/SConscript
-@@ -69,7 +69,7 @@
- #--------------------------#
- appdir = ""
- vdrift_install = None
--common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletcollision', 'libbulletmath', 'vorbisfile']
-+common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletCollision', 'libbulletMath', 'vorbisfile']
- if ( 'darwin' == sys.platform ):
- vdrift_install = "${PRODUCT_NAME}.app"
- pkgbase = "%s/Contents" % vdrift_install
-@@ -113,11 +113,11 @@
- local_env.Append( FRAMEWORKS = [ common_libs, 'Foundation', 'AppKit'] )
- src.append(['../tools/osx/SDLMain.m', '../tools/osx/config_mac.mm'])
- elif ( 'win32' == sys.platform or 'cygwin' == sys.platform ):
-- local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/out/mingwx86/optimize/libs', '#bullet-2.66/out/ntx86/optimize/libs']);
-+ local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/src/BulletCollision', '#bullet-2.66/src/LinearMath']);
- libs_link = ['opengl32', 'glu32', 'glew32', 'mingw32', 'SDLmain', 'SDL', common_libs ]
- else:
- local_env.ParseConfig('sdl-config --cflags --libs')
-- local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/out/linux/optimize/libs', '#bullet-2.66/out/linuxx86/optimize/libs'])
-+ local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/src/BulletCollision', '#bullet-2.66/src/LinearMath'])
- libs_link = ['GL', 'GLU', 'GLEW', common_libs]
-
- local_env.Append(LIBS = libs_link)
Added: packages/trunk/vdrift/debian/patches/no_SDL_net.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/no_SDL_net.diff (rev 0)
+++ packages/trunk/vdrift/debian/patches/no_SDL_net.diff 2009-02-22 14:31:54 UTC (rev 8916)
@@ -0,0 +1,31 @@
+--- vdrift-2009.02.15.dfsg.orig/SConstruct
++++ vdrift-2009.02.15.dfsg/SConstruct
+@@ -53,7 +53,7 @@
+ LIBPATH = ['.', '#lib', LOCALBASE + '/lib'],
+ LINKFLAGS = ['-pthread','-lintl'],
+ options = opts)
+- check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_net.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h']
++ check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h']
+ if 'CC' in os.environ:
+ env.Replace(CC = os.environ['CC'])
+ else:
+@@ -139,7 +139,7 @@
+ CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameter'],
+ LIBPATH = ['.', '#lib'],
+ options = opts)
+- check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_net.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h']
++ check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h']
+
+
+ #-------------------------------#
+--- vdrift-2009.02.15.dfsg.orig/src/SConscript
++++ vdrift-2009.02.15.dfsg/src/SConscript
+@@ -179,7 +179,7 @@
+ #--------------------------#
+ appdir = ""
+ vdrift_install = None
+-common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'vorbisfile']
++common_libs = ['SDL_image', 'SDL_gfx', 'vorbisfile']
+
+ #check to see how bullet was built
+ #if ( FindFile('libLinearMath.a', '#bullet-2.73/src/LinearMath') == None):
Deleted: packages/trunk/vdrift/debian/patches/scon_link_bullet.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/scon_link_bullet.diff 2009-02-22 13:40:26 UTC (rev 8915)
+++ packages/trunk/vdrift/debian/patches/scon_link_bullet.diff 2009-02-22 14:31:54 UTC (rev 8916)
@@ -1,20 +0,0 @@
---- vdrift-2008.08.05.dfsg.orig/src/SConscript
-+++ vdrift-2008.08.05.dfsg/src/SConscript
-@@ -69,7 +69,7 @@
- #--------------------------#
- appdir = ""
- vdrift_install = None
--common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletcollision', 'libbulletmath', 'vorbisfile']
-+common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'LibBulletDynamics', 'LibBulletCollision', 'LibLinearMath', 'vorbisfile']
- if ( 'darwin' == sys.platform ):
- vdrift_install = "${PRODUCT_NAME}.app"
- pkgbase = "%s/Contents" % vdrift_install
-@@ -117,7 +117,7 @@
- libs_link = ['opengl32', 'glu32', 'glew32', 'mingw32', 'SDLmain', 'SDL', common_libs ]
- else:
- local_env.ParseConfig('sdl-config --cflags --libs')
-- local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/out/linux/optimize/libs', '#bullet-2.66/out/linuxx86/optimize/libs'])
-+ local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/src/BulletDynamics', '#bullet-2.66/src/LinearMath', '#bullet-2.66/src/BulletCollision']);
- libs_link = ['GL', 'GLU', 'GLEW', common_libs]
-
- local_env.Append(LIBS = libs_link)
Modified: packages/trunk/vdrift/debian/patches/series
===================================================================
--- packages/trunk/vdrift/debian/patches/series 2009-02-22 13:40:26 UTC (rev 8915)
+++ packages/trunk/vdrift/debian/patches/series 2009-02-22 14:31:54 UTC (rev 8916)
@@ -1,2 +1 @@
-dont_build_Bullet_extras_and_demo.diff
-scon_link_bullet.diff
+no_SDL_net.diff
More information about the Pkg-games-commits
mailing list