Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Aug 2004 20:04:56 +0200
From:      Radim Kolar <hsn@netmag.cz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/70794: update: blender to 2.33a
Message-ID:  <20040821180456.GA56054@sanatana.dharma>
Resent-Message-ID: <200408211840.i7LIeDO4068597@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         70794
>Category:       ports
>Synopsis:       update: blender to 2.33a
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 21 18:40:13 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD sanatana.dharma 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #9: Tue Jul 27 11:13:42 CEST 2004 root@sanatana.dharma:/usr/src/sys/i386/compile/UP i386
>Description:
I have update blender to 2.33a. Changes:
blender do not uses autoconf build system anymore
added fix for malloc.h
added fix for compiling with open audio library
note: you can not use sdl without openal unless you are doing some minor
source code changes - sdl dependence excluded.
install python api docs
install again texture and sequence plugins
install additional import and textport scripts
install customized bmake
install changelogs
do not install blenderplayer - it crashes badly, some goes for netscape
laminator plugout.
	
>How-To-Repeat:
	
>Fix:
diff -Naur /usr/ports/graphics/blender-devel/Makefile ./Makefile
--- /usr/ports/graphics/blender-devel/Makefile	Wed Mar 17 10:41:44 2004
+++ ./Makefile	Wed Aug  4 16:38:53 2004
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/graphics/blender-devel/Makefile,v 1.13 2004/03/16 04:23:49 edwin Exp $
 
 PORTNAME=	blender
-PORTVERSION=	2.32
-PORTREVISION=	1
+PORTVERSION=	2.33a
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/
 PKGNAMESUFFIX=	-devel
@@ -15,27 +14,58 @@
 COMMENT=	3D modeling/rendering/animation/gaming package
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		glut.3:${PORTSDIR}/graphics/libglut \
 		png.5:${PORTSDIR}/graphics/png
 
-PLIST_FILES=	bin/blender
+PLIST_FILES=	bin/blender bin/bmake \
+		    lib/blender/include/documentation.h \
+		    lib/blender/include/floatpatch.h \
+		    lib/blender/include/iff.h \
+		    lib/blender/include/plugin.h \
+		    lib/blender/include/util.h \
+		lib/blender/plugins/texture/clouds2.so \
+		lib/blender/plugins/texture/tiles.so \
+		lib/blender/plugins/sequence/blur.so \
+		lib/blender/plugins/sequence/scatter.so \
+		lib/blender/plugins/sequence/showzbuf.so \
+		    lib/blender/scripts/DirectXExporter.py \
+		    lib/blender/scripts/mod_meshtools.py \
+		    lib/blender/scripts/raw_export.py \
+		    lib/blender/scripts/ac3d_export.py \
+		    lib/blender/scripts/off_export.py \
+		    lib/blender/scripts/raw_import.py \
+		    lib/blender/scripts/ac3d_import.py  \
+		    lib/blender/scripts/off_import.py \
+		    lib/blender/scripts/uv_export.py \
+		    lib/blender/scripts/blender2cal3d.py  \
+		    lib/blender/scripts/radiosity_export.py  \
+		    lib/blender/scripts/videoscape_export.py \
+		    lib/blender/scripts/mod_flags.py \
+		    lib/blender/scripts/radiosity_import.py  \
+		    lib/blender/scripts/wrl2export.py
+
+PLIST_DIRS=	lib/blender/include lib/blender/plugins/texture \
+		lib/blender/plugins/sequence lib/blender/plugins \
+		lib/blender/scripts lib/blender
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_SDL=	sdl
 USE_GL=		yes
 
-CONFIGURE_ARGS=	--with-sdl=${LOCALBASE} --disable-oggtest --disable-vorbistest --disable-sdltest
+#CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+#		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .endif
 
+.if defined(WITH_OPTIMIZED_CXXFLAGS)
+CXXFLAGS+=	-O3 -ffast-math
+.endif
+
 .if exists(${LOCALBASE}/lib/libfreetype.so.9) && !defined(WITHOUT_FREETYPE)
 WITH_FREETYPE=	yes
 .endif
@@ -44,18 +74,30 @@
 WITH_OPENAL=	yes
 .endif
 
+.ifndef NOPORTDOCS
+PORTDOCS=*
+.endif
+
 .if defined(WITH_FREETYPE)
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=	--with-freetype2=${LOCALBASE}
+MAKE_ENV+=	WITH_FREETYPE2=true
 .endif
 
 .if defined(WITH_OPENAL)
 LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
-CONFIGURE_ARGS+=	--enable-openal
+USE_SDL=	sdl
+.else
+MAKE_ENV+=	NAN_NO_OPENAL=true
 .endif
 
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
+.ifndef WITH_OPENAL
+	@${ECHO_MSG} "==> Define WITH_OPENAL for using Open Audio sound"
+.endif
+.ifndef WITH_FREETYPE
+	@${ECHO_MSG} "==> Define WITH_FREETYPE for True/Type1 font support"
+.endif
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
@@ -63,17 +105,30 @@
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|' \
-		${WRKSRC}/intern/SoundSystem/intern/SND_WaveCache.cpp
-
-	@${REINPLACE_CMD} -E -e \
-		's|^program_transform_name.+$$||; \
-		s| -DFreeBSD||; \
-		s|-lSDL|-lSDL-1.1|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+		${WRKSRC}/intern/SoundSystem/openal/SND_OpenALDevice.cpp \
+		${WRKSRC}/extern/ode/dist/ode/fbuild/test_ldlt.cpp
 
-	@${REINPLACE_CMD} -e \
-		's|-Wall||' \
-		${WRKSRC}/source/blender/python/api2_2x/Makefile.in \
-		${WRKSRC}/source/blender/python/Makefile.in
+do-install:
+	${INSTALL} ${WRKSRC}/obj/freebsd*/bin/blender  ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/lib/blender/include
+	${INSTALL_DATA} ${WRKSRC}/source/blender/blenpluginapi/*.h ${PREFIX}/lib/blender/include
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
+		${WRKSRC}/release/plugins/bmake
+	@${CHMOD} +x ${WRKSRC}/release/plugins/bmake	
+	${INSTALL_SCRIPT} ${WRKSRC}/release/plugins/bmake ${PREFIX}/bin
+	cd ${WRKSRC}/release/plugins && gmake all
+	${MKDIR} ${PREFIX}/lib/blender/plugins/sequence
+	${INSTALL} ${WRKSRC}/release/plugins/sequence/*.so ${PREFIX}/lib/blender/plugins/sequence
+	${MKDIR} ${PREFIX}/lib/blender/plugins/texture
+	${INSTALL} ${WRKSRC}/release/plugins/texture/*.so ${PREFIX}/lib/blender/plugins/texture
+	${MKDIR} ${PREFIX}/lib/blender/scripts
+	${INSTALL_DATA} ${WRKSRC}/release/scripts/*.py ${PREFIX}/lib/blender/scripts
+.ifndef NOPORTDOCS
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/release/text/release*.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/release/text/blender.html ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/pythonapi
+	${INSTALL_DATA} ${WRKSRC}/source/blender/python/api2_2x/doc/* ${DOCSDIR}/pythonapi
+.endif
 
 .include <bsd.port.mk>
diff -Naur /usr/ports/graphics/blender-devel/distinfo ./distinfo
--- /usr/ports/graphics/blender-devel/distinfo	Wed Mar 31 10:47:41 2004
+++ ./distinfo	Sun Aug  1 18:16:20 2004
@@ -1,2 +1,2 @@
-MD5 (blender-2.32.tar.bz2) = ebde5f573e19b7b8b64401d293c989e7
-SIZE (blender-2.32.tar.bz2) = 5661028
+MD5 (blender-2.33a.tar.bz2) = 987aafbbca4c13a648516fbd35caac08
+SIZE (blender-2.33a.tar.bz2) = 5129415
diff -Naur /usr/ports/graphics/blender-devel/files/patch-bmake ./files/patch-bmake
--- /usr/ports/graphics/blender-devel/files/patch-bmake	Thu Jan  1 01:00:00 1970
+++ ./files/patch-bmake	Wed Aug  4 16:03:57 2004
@@ -0,0 +1,11 @@
+--- release/plugins/bmake.orig	Tue Nov 25 21:10:06 2003
++++ release/plugins/bmake	Wed Aug  4 16:02:55 2004
+@@ -112,6 +112,8 @@
+ 	INCLUDES=-I..;
+ elif ( test -f "../include/plugin.h" ) then
+ 	INCLUDES=-I../include
++elif ( test -f "%%PREFIX%%/lib/blender/include/plugin.h" ) then
++	INCLUDES=-I%%PREFIX%%/lib/blender/include
+ else 
+ 	echo "Couldn't find plugin.h";
+ 	exit;
diff -Naur /usr/ports/graphics/blender-devel/files/patch-nosound ./files/patch-nosound
--- /usr/ports/graphics/blender-devel/files/patch-nosound	Thu Jan  1 01:00:00 1970
+++ ./files/patch-nosound	Sun Aug  1 22:43:43 2004
@@ -0,0 +1,10 @@
+--- intern/SoundSystem/intern/Makefile.orig	Wed Oct 22 01:27:08 2003
++++ intern/SoundSystem/intern/Makefile	Sun Aug  1 22:41:54 2004
+@@ -47,3 +47,7 @@
+ CPPFLAGS += -I../openal
+ CPPFLAGS += -I..
+ CPPFLAGS += -I.
++
++ifeq ($(NAN_NO_OPENAL),true)
++  CPPFLAGS += -DNO_SOUND
++endif
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040821180456.GA56054>