ports/109503: unbreak graphics/blender-devel
Martin Tournoij
carpetsmoker at xs4all.nl
Sat Feb 24 23:20:05 UTC 2007
>Number: 109503
>Category: ports
>Synopsis: unbreak graphics/blender-devel
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 24 23:20:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Tournoij
>Release: FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker at glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERIC i386
>Description:
- Unbreak
- Update to 2.43
- Added portdocs
- Added knobs
>How-To-Repeat:
>Fix:
--- patch-blender begins here ---
diff -ur blender-devel-old/Makefile blender-devel/Makefile
--- blender-devel-old/Makefile Sun Feb 25 00:07:32 2007
+++ Makefile Sun Feb 25 00:08:07 2007
@@ -2,10 +2,10 @@
# Date created: 27 Feb 2003
# Whom: David Yeske <dyeske at yahoo.com>
#
-# $FreeBSD: ports/graphics/blender-devel/Makefile,v 1.28 2007/02/11 01:23:29 kris Exp $
+# $FreeBSD$
PORTNAME= blender
-PORTVERSION= 2.42a
+PORTVERSION= 2.43
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
@@ -15,29 +15,44 @@
MAINTAINER= dyeske at yahoo.com
COMMENT= 3D modeling/rendering/animation/gaming package
-BUILD_DEPENDS= ${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2 \
png.5:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- SDL.11:${PORTSDIR}/devel/sdl12 \
- Half.2:${PORTSDIR}/graphics/OpenEXR \
- gettextpo.1:${PORTSDIR}/devel/gettext \
- avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
-
-BROKEN= Does not build
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2007-04-10
+ tiff.4:${PORTSDIR}/graphics/tiff
PLIST_FILES= bin/blender
-USE_X_PREFIX= yes
-USE_PYTHON= 2.3
-USE_SCONS= yes
+USE_PYTHON= 2.4
USE_SDL= sdl
-USE_GL= yes
+USE_SCONS= yes
+SCONS_ARGS= BF_FANCY=0
+PLIST_FILES= bin/blender
+PORTDOCS= BlenderQuickStart.pdf release_243.txt blender.html
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -ffast-math
+.if defined(WITH_FFMPEG)
+SCONS_ARGS+= WITH_BF_FFMPEG=true
+LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
+.endif
+.if defined(WITH_OPENEXR)
+SCONS_ARGS+= WITH_BF_OPENEXR=true
+LIB_DEPENDS+= Half.2:${PORTSDIR}/graphics/OpenEXR
+.endif
+.if defined(WITH_DEBUG)
+SCONS_ARGS+= BF_DEBUG=true
+.endif
+.if defined(WITHOUT_NLS)
+SCONS_ARGS+= WITH_BF_INTERNATIONAL=false
+.else
+USE_GETTEXT= yes
+BUILD_DEPENDS+= ${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
+.endif
+.if defined(WITHOUT_BULLET)
+SCONS_ARGS+= WITH_BF_BULLET=false
+.endif
+.if defined(WITHOUT_OPENAL)
+SCONS_ARGS+= WITH_BF_OPENAL=false
+.else
+LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \
+ alut.1:${PORTSDIR}/audio/freealut
.endif
.include <bsd.port.pre.mk>
@@ -46,13 +61,38 @@
BROKEN= Does not compile on 4.x
.endif
-pre-everything::
-.if !defined(WITH_OPTIMIZED_CFLAGS)
- @${ECHO_MSG} "You can enable additional compilation optimizations"
- @${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
-.endif
+pre-fetch:
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "Note that the blender game engine doesn't work on FreeBSD at the moment"
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "You can use the following build options:"
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "WITH_FFMPEG=yes Enable ffmpeg Support."
+ @${ECHO_CMD} "WITH_OPENEXR=yes Enable OpenEXR Support."
+ @${ECHO_CMD} "WITH_DEBUG=yes Add Debug Flags."
+ @${ECHO_CMD} "WITHOUT_BULLET=yes Disable Bullet (Physics Engine)."
+ @${ECHO_CMD} "WITHOUT_OPENAL=yes Disable OpenAL Sound Support."
+ @${ECHO_CMD} "WITHOUT_NLS=yes Native Language Support via gettext utilities"
+ @${ECHO_CMD} ""
+
+post-patch:
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|; \
+ s|%%X11BASE%%|${X11BASE}|; \
+ s|%%CC%%|${CC}|; \
+ s|%%CXX%%|${CXX}|;" ${WRKSRC}/user-config.py
+
+do-build:
+ @cd ${WRKSRC} && \
+ ${SCONS_BIN} ${SCONS_ARGS}
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/../install/freebsd/blender ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKDIR}/install/freebsd/blender ${PREFIX}/bin
+
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKDIR}/install/freebsd/${doc} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.post.mk>
diff -ur blender-devel-old/distinfo blender-devel/distinfo
--- blender-devel-old/distinfo Sun Feb 25 00:07:32 2007
+++ distinfo Sun Feb 25 00:08:07 2007
@@ -1,3 +1,3 @@
-MD5 (blender-2.42a.tar.gz) = 3d60b7ebe0dea47da12744fe2462d96c
-SHA256 (blender-2.42a.tar.gz) = f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52
-SIZE (blender-2.42a.tar.gz) = 12295244
+MD5 (blender-2.43.tar.gz) = 7629c31bc45e286bdf3b2c555e6446a2
+SHA256 (blender-2.43.tar.gz) = a48213b61302d03eb8db0cf42712b142d280d16ad111f6411cd8e43403e5e61b
+SIZE (blender-2.43.tar.gz) = 13806334
diff -ur blender-devel-old/files/patch-intern_ghost-SConscript blender-devel/files/patch-intern_ghost-SConscript
--- blender-devel-old/files/patch-intern_ghost-SConscript Sun Feb 25 00:07:32 2007
+++ files/patch-intern_ghost-SConscript Sun Feb 25 00:08:07 2007
@@ -1,27 +1,11 @@
---- intern/ghost/SConscript.orig Mon Jun 5 17:52:26 2006
-+++ intern/ghost/SConscript Mon Aug 21 00:20:20 2006
-@@ -26,6 +26,24 @@
+--- SConscript.orig Sat Feb 24 16:17:37 2007
++++ intern/ghost/SConscript Sat Feb 24 16:17:55 2007
+@@ -10,7 +10,7 @@
+
+ pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
+
+-if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'):
++if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'freebsd5', 'freebsd7'):
for f in pf:
sources.remove('intern' + os.sep + f + 'Win32.cpp')
sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd4':
-+ for f in pf:
-+ sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+ sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd5':
-+ for f in pf:
-+ sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+ sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd6':
-+ for f in pf:
-+ sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+ sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd7':
-+ for f in pf:
-+ sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+ sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+
-+
- else:
- print "Unknown window system specified."
- Exit()
diff -ur blender-devel-old/files/patch-user-config_py blender-devel/files/patch-user-config_py
--- blender-devel-old/files/patch-user-config_py Sun Feb 25 00:07:32 2007
+++ files/patch-user-config_py Sun Feb 25 00:08:07 2007
@@ -1,46 +1,46 @@
---- user-config.py.orig Mon Aug 21 01:28:00 2006
-+++ user-config.py Mon Aug 21 01:28:13 2006
-@@ -0,0 +1,163 @@
+--- user-config.py.orig Fri Feb 23 21:55:25 2007
++++ user-config.py Fri Feb 23 22:50:09 2007
+@@ -0,0 +1,125 @@
+LCGDIR = '../lib/freebsd'
-+BF_PYTHON = '/usr/local'
-+BF_PYTHON_VERSION = '2.3'
++BF_PYTHON = '%%LOCALBASE%%'
++BF_PYTHON_VERSION = '2.4'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
+
-+WITH_BF_OPENAL = 'false'
-+BF_OPENAL = '/usr/local'
++WITH_BF_OPENAL = 'true'
++BF_OPENAL = '%%LOCALBASE%%'
+BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
-+BF_OPENAL_LIB = 'openal'
++BF_OPENAL_LIB = 'alut'
+
+WITH_BF_SDL = 'true'
-+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
++BF_SDL = '%%LOCALBASE%%'
++BF_SDL_INC = '${BF_SDL}/include/SDL'
++BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_FMOD = 'false'
+BF_FMOD = LCGDIR + '/fmod'
+
-+WITH_BF_OPENEXR = 'true'
-+BF_OPENEXR = '/usr/local'
++WITH_BF_OPENEXR = 'false'
++BF_OPENEXR = '%%LOCALBASE%%'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+
+WITH_BF_JPEG = 'true'
-+BF_JPEG = '/usr/local'
++BF_JPEG = '%%LOCALBASE%%'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = 'true'
-+BF_PNG = '/usr/local'
++BF_PNG = '%%LOCALBASE%%'
+BF_PNG_INC = '${BF_PNG}/include/libpng'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
-+BF_TIFF = '/usr/local'
++BF_TIFF = '%%LOCALBASE%%'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = 'true'
@@ -50,21 +50,20 @@
+
+WITH_BF_INTERNATIONAL = 'true'
+
-+BF_GETTEXT = '/usr/local'
++BF_GETTEXT = '%%LOCALBASE%%'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl iconv'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
-+WITH_BF_FTGL = 'true'
-+BF_FTGL = '/usr/X11R6'
++WITH_BF_FTGL = 'false'
++BF_FTGL = '%%X11BASE%%'
+BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
+BF_FTGL_LIB = 'extern_ftgl'
+#BF_FTGL = '#extern/bFTGL'
+#BF_FTGL_INC = '${BF_FTGL}/include'
+#BF_FTGL_LIB = 'extern_ftgl'
+
-+
-+WITH_BF_GAMEENGINE='true'
++WITH_BF_GAMEENGINE='false'
+
+WITH_BF_ODE = 'false'
+BF_ODE = LCGDIR + '/ode'
@@ -80,87 +79,50 @@
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
-+#WITH_BF_NSPR = 'true'
-+#BF_NSPR = $(LCGDIR)/nspr
-+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-+#BF_NSPR_LIB =
-+
-+# Uncomment the following line to use Mozilla inplace of netscape
-+#CPPFLAGS += -DMOZ_NOT_NET
-+# Location of MOZILLA/Netscape header files...
-+#BF_MOZILLA = $(LCGDIR)/mozilla
-+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-+#BF_MOZILLA_LIB =
-+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-+# if this is not set.
-+#
-+# Be paranoid regarding library creation (do not update archives)
-+#BF_PARANOID = 'true'
-+
-+# enable freetype2 support for text objects
-+BF_FREETYPE = '/usr/local'
++BF_FREETYPE = '%%LOCALBASE%%'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
-+WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
-+BF_QUICKTIME = '/usr/local'
++WITH_BF_QUICKTIME = 'false'
++BF_QUICKTIME = '%%LOCALBASE%%'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
-+# enable ffmpeg support
-+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
-+BF_FFMPEG = '/usr/local'
++WITH_BF_FFMPEG = 'false'
++BF_FFMPEG = '%%LOCALBASE%%'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-+BF_FFMPEG_LIBPATH='$(BF_FFMPEG)/lib'
++BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avformat avcodec avutil'
+
-+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = 'true'
-+BF_OPENGL = '/usr/X11R6'
++BF_OPENGL = '%%X11BASE%%'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'OSMesa'
+BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.so ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
-+##
-+CC = 'gcc'
-+CXX = 'g++'
-+##ifeq ($CPU),alpha)
-+## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+
-+CPPFLAGS = ['-DXP_UNIX','-I/usr/local/include','-I/usr/X11R6/include']
-+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-I/usr/local/include','-I/usr/X11R6/include']
++CPPFLAGS = ['-DXP_UNIX','-I%%LOCALBASE%%/include','-I%%X11BASE%%/include']
++CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-I%%LOCALBASE%%/include','-I%%X11BASE%%/include']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
-+##BF_DEPEND = 'true'
-+##
-+##AR = ar
-+##ARFLAGS = ruv
-+##ARFLAGSQUIET = ru
-+##
-+CC = 'gcc'
-+CXX = 'g++'
++
++CC = '%%CC%%'
++CXX = '%%CXX%%'
+C_WARN = '-Wall'
+
+CC_WARN = '-Wall'
+
-+##FIX_STUBS_WARNINGS = -Wno-unused
-+
+LLIBS = 'util m pthread stdc++'
-+##LOPTS = --dynamic
-+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE = 'false'
+
+BF_DEBUG = 'false'
-+BF_DEBUG_FLAGS = ''
++BF_DEBUG_FLAGS = '-g'
+
+BF_BUILDDIR = '../build/freebsd'
+BF_INSTALLDIR='../install/freebsd'
+
-+
-+#Link against pthread
-+PLATFORM_LINKFLAGS = ['-pthread','-L/usr/local/lib','-L/usr/X11R6/lib']
++PLATFORM_LINKFLAGS = ['-pthread','-L%%LOCALBASE%%/lib','-L%%X11BASE%%/lib']
--- patch-blender ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list