Build on Linux.

6 files changed, 54 insertions, 5 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index ff82d411618..2ea5c7f9b7a 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2014/01/10 20:06:46 joerg Exp $
+# $NetBSD: Makefile,v 1.102 2014/02/01 03:57:52 markd Exp $
 
 DISTNAME=	blender-2.69
 CATEGORIES=	graphics
@@ -40,8 +40,10 @@ SCONS_ARGS+=	WITH_BF_JACK=False
 SCONS_ARGS+=	WITH_BF_OPENAL=False
 SCONS_ARGS+=	WITH_BF_SNDFILE=False
 SCONS_ARGS+=	WITH_BF_FFMPEG=False
+SCONS_ARGS+=	WITH_BF_3DMOUSE=False
 
 SCONS_ARGS+=	BF_PYTHON=${PREFIX}
+SCONS_ARGS+=	BF_PYTHON_ABI_FLAGS=''
 SCONS_ARGS+=	BF_SDL=${BUILDLINK_PREFIX.SDL}
 SCONS_ARGS+=	BF_OPENEXR=${BUILDLINK_PREFIX.openexr}
 SCONS_ARGS+=	BF_JPEG=${BUILDLINK_PREFIX.jpeg}
@@ -70,6 +72,9 @@ do-install:
 CHECK_INTERPRETER_SKIP=	share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py \
 			share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/python/lib/python3.3/venv/scripts/posix/pydoc
 
+REPLACE_PYTHON+=	release/bin/blender-thumbnailer.py
+REPLACE_PYTHON+=	intern/cycles/kernel/SConscript
+
 post-install:
 	${LN} -sf ${PREFIX}/share/blender/blender \
 		${DESTDIR}${PREFIX}/bin
diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST
index ad9ba3e55f5..db2d92cf657 100644
--- a/graphics/blender/PLIST
+++ b/graphics/blender/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/01/10 20:06:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/02/01 03:57:52 markd Exp $
 bin/blender
 share/blender/${PKGVERSION}/datafiles/fonts/bmonofont-i18n.ttf.gz
 share/blender/${PKGVERSION}/datafiles/fonts/droidsans.ttf.gz
@@ -389,8 +389,6 @@ share/blender/${PKGVERSION}/python/lib/python3.3/pickle.py
 share/blender/${PKGVERSION}/python/lib/python3.3/pickletools.py
 share/blender/${PKGVERSION}/python/lib/python3.3/pipes.py
 share/blender/${PKGVERSION}/python/lib/python3.3/pkgutil.py
-share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/IN.py
-share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/regen
 share/blender/${PKGVERSION}/python/lib/python3.3/platform.py
 share/blender/${PKGVERSION}/python/lib/python3.3/plistlib.py
 share/blender/${PKGVERSION}/python/lib/python3.3/poplib.py
diff --git a/graphics/blender/PLIST.Linux b/graphics/blender/PLIST.Linux
new file mode 100644
index 00000000000..76c4505563a
--- /dev/null
+++ b/graphics/blender/PLIST.Linux
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2014/02/01 03:57:52 markd Exp $
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/_sqlite3.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/ossaudiodev.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/pyexpat.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/readline.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/spwd.so
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/CDROM.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/DLFCN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/IN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/TYPES.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/regen
+share/blender/blender-thumbnailer.py
+share/blender/icons/16x16/apps/blender.png
+share/blender/icons/22x22/apps/blender.png
+share/blender/icons/24x24/apps/blender.png
+share/blender/icons/256x256/apps/blender.png
+share/blender/icons/32x32/apps/blender.png
+share/blender/icons/48x48/apps/blender.png
+share/blender/icons/blender_icon_source.svg
+share/blender/icons/scalable/apps/blender.svg
diff --git a/graphics/blender/PLIST.NetBSD b/graphics/blender/PLIST.NetBSD
new file mode 100644
index 00000000000..eb301d580bf
--- /dev/null
+++ b/graphics/blender/PLIST.NetBSD
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2014/02/01 03:57:52 markd Exp $
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/IN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/regen
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 356ed2d5b1b..6f3ca5505a6 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.39 2014/01/10 20:06:46 joerg Exp $
+$NetBSD: distinfo,v 1.40 2014/02/01 03:57:52 markd Exp $
 
 SHA1 (blender-2.69.tar.gz) = 9500410d2457d99e685ca506bec12851454dc5d4
 RMD160 (blender-2.69.tar.gz) = 27997d071a767630baeaddc0017e19dccb99b1a9
 Size (blender-2.69.tar.gz) = 41274518 bytes
 SHA1 (patch-ab) = f752ba279aed273bb5c93ede64c2d7292f33fd83
+SHA1 (patch-build__files_scons_config_linux-config.py) = 863ff0b2839fa96a4b579cb52d7c4475aa4c571c
 SHA1 (patch-build__files_scons_config_netbsd6-config.py) = a2ef239cc40430a5eaafd006b423e7f70ac9ee80
 SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098
 SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 52c9ee0e0c73b9b9628a3d82292a9588ff0060da
diff --git a/graphics/blender/patches/patch-build__files_scons_config_linux-config.py b/graphics/blender/patches/patch-build__files_scons_config_linux-config.py
new file mode 100644
index 00000000000..675f9661823
--- /dev/null
+++ b/graphics/blender/patches/patch-build__files_scons_config_linux-config.py
@@ -0,0 +1,22 @@
+$NetBSD: patch-build__files_scons_config_linux-config.py,v 1.1 2014/02/01 03:57:52 markd Exp $
+
+--- ./build_files/scons/config/linux-config.py.orig	2013-02-07 14:10:01.000000000 +0000
++++ ./build_files/scons/config/linux-config.py
+@@ -178,7 +178,7 @@ BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/li
+ BF_JEMALLOC_LIB = 'jemalloc'
+ BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
+ 
+-WITH_BF_OIIO = False
++WITH_BF_OIIO = True
+ WITH_BF_STATICOIIO = False
+ BF_OIIO = '/usr'
+ BF_OIIO_INC = '${BF_OIIO}/include'
+@@ -218,7 +218,7 @@ WITH_BF_RAYOPTIMIZATION = True
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+ 
+ #SpaceNavigator and friends
+-WITH_BF_3DMOUSE = True
++WITH_BF_3DMOUSE = False
+ WITH_BF_STATIC3DMOUSE = False
+ BF_3DMOUSE = '/usr'
+ BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'