diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2006-08-21 16:09:18 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2006-08-21 16:09:18 +0000 |
| commit | cf68b3585738d9ed7940f842139014995b80e55a (patch) | |
| tree | 69b197697378c262d142cc82e389e9c2eba5cffb /graphics/py-soya3d | |
| parent | 0977976ddedb384080ee47a64ff1269a4f793e19 (diff) | |
| download | ports-cf68b3585738d9ed7940f842139014995b80e55a.tar.gz ports-cf68b3585738d9ed7940f842139014995b80e55a.zip | |
- Fix build with recent graphics/cal3d
- Fix linking problem with openal lib
Approved by: garga (mentor)
Notes
Notes:
svn path=/head/; revision=171121
Diffstat (limited to 'graphics/py-soya3d')
| -rw-r--r-- | graphics/py-soya3d/Makefile | 3 | ||||
| -rw-r--r-- | graphics/py-soya3d/files/patch-setup.py | 43 |
2 files changed, 17 insertions, 29 deletions
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index d71f3a1e5aab..7672ceed7fd0 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= soya3d PORTVERSION= 0.12 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.gna.org/soya/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,7 +22,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal \ ${PYTHON_SITELIBDIR}/pysdl_mixer/sdl_mixer.so:${PORTSDIR}/audio/py-sdl_mixer \ pyrexc:${PORTSDIR}/devel/pyrex -LIB_DEPENDS= cal3d.11:${PORTSDIR}/graphics/cal3d \ +LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \ GLEW.1:${PORTSDIR}/graphics/glew \ freetype.9:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \ diff --git a/graphics/py-soya3d/files/patch-setup.py b/graphics/py-soya3d/files/patch-setup.py index a0afced8b952..70e12375091a 100644 --- a/graphics/py-soya3d/files/patch-setup.py +++ b/graphics/py-soya3d/files/patch-setup.py @@ -1,34 +1,13 @@ ---- setup.py.orig Tue Jul 18 15:14:24 2006 -+++ setup.py Thu Jul 27 20:21:36 2006 -@@ -32,21 +32,22 @@ - INCDIR = [ - "ode-0.5/include", - "/usr/include", -- "/usr/local/include", -- "/usr/X11R6/include", -+ "%%LOCALBASE%%/include", -+ "%%X11BASE%%/include", +--- setup.py Mon Aug 21 00:22:53 2006 ++++ setup.py Mon Aug 21 00:24:52 2006 +@@ -37,6 +37,7 @@ "/usr/include/freetype2", -- "/usr/local/include/freetype2", -+ "%%LOCALBASE%%/include/freetype2", + "/usr/local/include/freetype2", "/usr/include/cal3d", -- "/usr/local/include/cal3d", -+ "%%LOCALBASE%%/include/SDL11", -+ "%%LOCALBASE%%/include/cal3d", ++ "/usr/local/include/SDL11", + "/usr/local/include/cal3d", "/sw/include", # For Mac OS X "fink" "/opt/local/include", # For Mac OS X "darwin port" - ] - LIBDIR = [ - "ode-0.5/lib", - "/usr/lib", -- "/usr/local/lib", -+ "%%LOCALBASE%%/lib", - "/opt/local/lib", # For Mac OS X "darwin port" -- "/usr/X11R6/lib", -+ "%%X11BASE%%/lib", - "/sw/lib/", # For Mac OS X - ] - @@ -80,7 +81,7 @@ LIBS = ["m", "glew32", "SDL", "freetype", "cal3d", "stdc++"] else: @@ -38,7 +17,15 @@ SOYA_PYREX_SOURCES = ["_soya.pyx", "matrix.c", "chunk.c" ] SOYA_C_SOURCES = ["_soya.c" , "matrix.c", "chunk.c" ] -@@ -133,14 +134,14 @@ +@@ -99,6 +100,7 @@ + if USE_OPENAL: + print "Sound support (with OpenAL) enabled..." + LIBS.append("openal") ++ LIBS.append("alut") + CONFIG_PXD_FILE.write("""include "sound/al.pxd"\n""") + CONFIG_PYX_FILE.write("""include "sound/sound.pyx"\n""") + else: +@@ -133,14 +135,14 @@ print "ODE and OPCODE have already been compiled; if you want to recompile them do: cd %s ; make clean" % ODE_DIR else: print "Building ODE and OPCODE from %s" % ODE_DIR |