pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/blender Big bugfix release fixing at least a ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/06f451a36570
branches: trunk
changeset: 489815:06f451a36570
user: reinoud <reinoud%pkgsrc.org@localhost>
date: Sat Feb 26 20:34:43 2005 +0000
description:
Big bugfix release fixing at least a 200 outstanding bugs and its
game-engine is finally working now.
Dynamic loading of python `import'ed modules finally work now too.
diffstat:
graphics/blender/Makefile | 28 +++++++--
graphics/blender/distinfo | 13 ++-
graphics/blender/patches/patch-aa | 13 ----
graphics/blender/patches/patch-ac | 21 +++++++
graphics/blender/patches/patch-ad | 25 ++++++++
graphics/blender/patches/patch-ae | 107 ++++++++++++++++++++++++++++++++++++++
graphics/blender/patches/patch-af | 12 ++++
graphics/blender/patches/patch-ag | 11 +++
8 files changed, 204 insertions(+), 26 deletions(-)
diffs (truncated from 301 to 300 lines):
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/Makefile
--- a/graphics/blender/Makefile Sat Feb 26 18:48:19 2005 +0000
+++ b/graphics/blender/Makefile Sat Feb 26 20:34:43 2005 +0000
@@ -1,38 +1,49 @@
-# $NetBSD: Makefile,v 1.37 2004/10/15 11:43:51 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/02/26 20:34:43 reinoud Exp $
#
-DISTNAME= blender-2.32
-PKGREVISION= 4
+DISTNAME= blender-2.36
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
http://download.blender.org/source/
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= jschauma%NetBSD.org@localhost
HOMEPAGE= http://www.blender.org/
COMMENT= Fully integrated 3D graphics creation suite
+BUILD_DEPENDS+= scons>=0.96:../../devel/scons
+
+WRKSRC= ${WRKDIR}/blender
+
USE_X11= YES
-HAS_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_BUILDLINK3= YES
USE_LIBTOOL= YES
LDFLAGS+= -lcrypto
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-CONFIGURE_ARGS+= --prefix=${PREFIX} --without-ode
-
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= BLENDER_USE_OGG BLENDER_USE_VORBIS
BUILD_DEFS+= BLENDER_USE_OPENAL BLENDER_USE_EXPPYTHON
BUILD_DEFS+= BLENDER_INSTALL_DOC
+post-patch:
+ ${MV} ${WRKSRC}/SConstruct ${WRKSRC}/SConstruct.orig
+ ${AWK} '{print} NR == 54 {print "env.Append(LINKFLAGS = \"-Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib\")"}' ${WRKSRC}/SConstruct.orig > ${WRKSRC}/SConstruct
+
+do-build:
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ADD_C_INCLUDE_DIRS=${WRKDIR}/.buildlink/include ADD_C_LIB_DIRS=${WRKDIR}/.buildlink/lib \
+ ${PREFIX}/bin/scons -C ${WRKSRC} prefix=${PREFIX}
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/blender ${PREFIX}/bin
+
.if defined(BLENDER_INSTALL_DOC)
DEPENDS+= blender-doc:../../graphics/blender-doc
.endif
+.if 0
.if defined(BLENDER_USE_OGG)
CONFIGURE_ARGS+= --with-ogg=${PREFIX}
.include "../../multimedia/libogg/buildlink3.mk"
@@ -57,6 +68,7 @@
.else
CONFIGURE_ARGS+= --disable-exppython
.endif
+.endif
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/distinfo
--- a/graphics/blender/distinfo Sat Feb 26 18:48:19 2005 +0000
+++ b/graphics/blender/distinfo Sat Feb 26 20:34:43 2005 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 08:45:03 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/02/26 20:34:43 reinoud Exp $
-SHA1 (blender-2.32.tar.bz2) = 79a508e234d5e40287e9ebef352e3b0ee2ad443e
-RMD160 (blender-2.32.tar.bz2) = 94dedf9ad8af5921587854054e4fae48b3c57778
-Size (blender-2.32.tar.bz2) = 5661028 bytes
-SHA1 (patch-aa) = 733f4ec4e5236e4196288ead26c2680a78e2d77b
+SHA1 (blender-2.36.tar.gz) = 7f771bfc5fd77d0c7d17f10d235217714936a614
+Size (blender-2.36.tar.gz) = 6912828 bytes
SHA1 (patch-ab) = 46b1d28ee4702501cdc6a7b48cbd0eb2642550c8
+SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
+SHA1 (patch-ad) = 51fd489f3e8065d7212bd86149821a9a2b70faeb
+SHA1 (patch-ae) = 7635599afe0629a5c2e127c3d3ab26043934e5d7
+SHA1 (patch-af) = af095208cedd346621f59e9c85fa8693f3258dd3
+SHA1 (patch-ag) = ef3a596fc6a909eff1fb4d500140405573484543
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-aa
--- a/graphics/blender/patches/patch-aa Sat Feb 26 18:48:19 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/02/17 20:39:01 jschauma Exp $
-
---- Makefile.in.orig 2004-02-17 15:13:03.000000000 -0500
-+++ Makefile.in 2004-02-17 15:13:17.000000000 -0500
-@@ -974,7 +974,7 @@
- exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h all-local
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
- install-binPROGRAMS: install-libLTLIBRARIES
-
- installdirs: installdirs-recursive
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/blender/patches/patch-ac Sat Feb 26 20:34:43 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+
+--- source/nan_warn.mk.orig 2004-09-01 14:09:22.000000000 +0200
++++ source/nan_warn.mk
+@@ -35,11 +35,11 @@
+ #
+
+ # Force the correct redefinition
+-LEVEL_1_C_WARNINGS = -FIX_NAN_WARN
+-LEVEL_1_CPP_WARNINGS = -FIX_NAN_WARN
+-LEVEL_2_C_WARNINGS = -FIX_NAN_WARN
+-LEVEL_2_CPP_WARNINGS = -FIX_NAN_WARN
+-FIX_STUBS_WARNINGS = -FIX_NAN_WARN
++LEVEL_1_C_WARNINGS = -DFIX_NAN_WARN
++LEVEL_1_CPP_WARNINGS = -DFIX_NAN_WARN
++LEVEL_2_C_WARNINGS = -DFIX_NAN_WARN
++LEVEL_2_CPP_WARNINGS = -DFIX_NAN_WARN
++FIX_STUBS_WARNINGS = -DFIX_NAN_WARN
+
+ ########################################################################
+ # Level 1: basic C warnings.
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/blender/patches/patch-ad Sat Feb 26 20:34:43 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+
+--- source/nan_compile.mk.orig 2004-12-08 15:12:46.000000000 +0100
++++ source/nan_compile.mk
+@@ -159,6 +159,20 @@ ifeq ($(OS),openbsd)
+ ARFLAGSQUIET = ru
+ endif
+
++ifeq ($(OS),netbsd)
++ CC = gcc
++ CCC = g++
++ CFLAGS += -pipe -fPIC
++ CCFLAGS += -pipe -fPIC
++ REL_CFLAGS += -O2
++ REL_CCFLAGS += -O2
++ NAN_DEPEND = true
++ OPENGL_HEADERS = /usr/X11R6/include
++ AR = ar
++ ARFLAGS = ruv
++ ARFLAGSQUIET = ru
++endif
++
+ ifeq ($(OS),solaris)
+ CC = gcc
+ CCC = g++
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/blender/patches/patch-ae Sat Feb 26 20:34:43 2005 +0000
@@ -0,0 +1,107 @@
+$NetBSD: patch-ae,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+
+--- SConstruct.orig 2004-12-21 18:00:25.000000000 +0100
++++ SConstruct
+@@ -50,7 +50,92 @@ sdl_env = Environment ()
+ freetype_env = Environment ()
+ env = Environment ()
+
+-if sys.platform == 'linux2' or sys.platform == 'linux-i386':
++# pkgsrc patch
++#
++sys.platform = 'pkgsrc'
++if sys.platform == 'pkgsrc':
++ print "Building for pkgsrc systems"
++ use_international = 'false'
++ use_gameengine = 'true'
++ use_openal = 'false'
++ use_fmod = 'false'
++ use_quicktime = 'false'
++ use_sumo = 'false' # TODO
++ use_ode = 'false'
++ use_buildinfo = 'true'
++ build_blender_dynamic = 'true'
++ build_blender_static = 'false'
++ build_blender_player = 'false'
++ build_blender_plugin = 'false'
++ release_flags = ['-O2']
++ debug_flags = ['-O2', '-g']
++ extra_flags = ['-pipe', '-fPIC', '-funsigned-char']
++ cxxflags = []
++ defines = []
++ warn_flags = ['-Wall','-W']
++ window_system = 'X11'
++ platform_libs = ['m', 'stdc++', 'pthread', 'util']
++ platform_libpath = []
++ platform_linkflags = []
++ extra_includes = []
++ z_lib = ['z']
++ z_libpath = []
++ z_include = []
++ # png library information
++ png_lib = ['png']
++ png_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
++ png_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
++ # jpeg library information
++ jpeg_lib = ['jpeg']
++ jpeg_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
++ jpeg_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
++ # OpenGL library information
++ opengl_lib = ['GL', 'GLU']
++ opengl_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
++ opengl_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
++ opengl_static = ['libGL.a', 'libGLU.a']
++ # SDL library information
++ sdl_env.ParseConfig ('sdl-config --cflags --libs')
++ sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
++ sdl_include = sdl_env.Dictionary()['CPPPATH']
++ sdl_libpath = sdl_env.Dictionary()['LIBPATH']
++ sdl_lib = sdl_env.Dictionary()['LIBS']
++ # SOLID library information
++ solid_lib = [] # TODO
++ solid_libpath = [] # TODO
++ solid_include = ['#extern/solid']
++ qhull_lib = [] # TODO
++ qhull_libpath = [] # TODO
++ qhull_include = ['#extern/qhull/include']
++ # ODE library information
++ ode_lib = ['ode']
++ ode_libpath = ['#../lib/linux-glibc2.2.5-i386/ode/lib']
++ ode_include = ['#../lib/linux-glibc2.2.5-i386/ode/include']
++ # Python library information
++ python_lib = ['python%d.%d' % sys.version_info[0:2]]
++ python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
++ python_include = [sysconfig.get_python_inc ()]
++ python_linkflags = Split (sysconfig.get_config_var('LINKFORSHARED'))
++ # International support information
++ ftgl_lib = ['ftgl']
++ ftgl_libpath = ['#../lib/linux-glibc2.2.5-i386/ftgl/lib']
++ ftgl_include = ['#../lib/linux-glibc2.2.5-i386/ftgl/include']
++ freetype_env.ParseConfig('pkg-config --cflags --libs freetype2')
++ freetype_lib = freetype_env.Dictionary()['LIBS']
++ freetype_libpath = freetype_env.Dictionary()['LIBPATH']
++ freetype_include = freetype_env.Dictionary()['CPPPATH']
++ gettext_lib = []
++ gettext_libpath = []
++ gettext_include = []
++ # OpenAL library information
++ openal_lib = ['openal']
++ openal_libpath = []
++ openal_include = []
++
++elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
++ print "Building for FreeBSD"
++
++elif sys.platform == 'linux2' or sys.platform == 'linux-i386':
+ use_international = 'false'
+ use_gameengine = 'true'
+ use_openal = 'false'
+@@ -591,7 +676,7 @@ elif sys.platform=='openbsd3':
+ use_openal = 'false'
+ use_fmod = 'false'
+ use_quicktime = 'false'
+- use_sumo = 'false'
++ use_sumo = 'true'
+ use_ode = 'false'
+ use_buildinfo = 'true'
+ build_blender_dynamic = 'true'
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/blender/patches/patch-af Sat Feb 26 20:34:43 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+
+--- source/gameengine/BlenderRoutines/SConscript.orig 2004-05-16 15:07:17.000000000 +0200
++++ source/gameengine/BlenderRoutines/SConscript
+@@ -46,6 +46,7 @@ kx_blenderhook_env.Append (CPPPATH=['.',
+
+ kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+ kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
++kx_blenderhook_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
+
+ if sys.platform=='win32':
+ kx_blenderhook_env.Append (CXXFLAGS = ['/GR'])
diff -r b2c1f127af92 -r 06f451a36570 graphics/blender/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/blender/patches/patch-ag Sat Feb 26 20:34:43 2005 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+
+--- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.orig 2004-05-16 15:07:16.000000000 +0200
++++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+@@ -14,5 +14,6 @@ ras_openglrasterizer_env.Append (CPPPATH
+ '#intern/moto/include',
+ '#source/gameengine/Rasterizer'
+ ])
++ras_openglrasterizer_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
+
Home |
Main Index |
Thread Index |
Old Index