Merge lp:~smartboyhw/ubuntu/raring/blender/2.66a-3ubuntu1-merge into lp:ubuntu/raring/blender

[Howard Chan]

powerpc builds failed for 2.66a-2ubuntu1 in raring-proposed. Micah Gersten contacted Debian and they made a patch immediately to fix the bugs. Since the debian build in https://buildd.debian.org/status/package.php?p=blender&suite=experimental for 2.66a-3 works now, the Ubuntu build should work too. Henceforth I merged it and proposed to get this in to Raring. Especially the Ubuntu Studio team wants it in for Beta 1.

[Andrew Starr-Bochicchio (andrewsomething)]

It looks like Jeremy Bicha beat you to this. The same version is in raring and it builds on PPC.

https://launchpad.net/ubuntu/+source/blender/2.66a-3ubuntu1

review: Disapprove

=== removed directory '.pc/0001-blender_thumbnailer.patch'
=== removed directory '.pc/0001-blender_thumbnailer.patch/release'
=== removed directory '.pc/0001-blender_thumbnailer.patch/release/bin'
=== removed file '.pc/0001-blender_thumbnailer.patch/release/bin/blender-thumbnailer.py'
--- .pc/0001-blender_thumbnailer.patch/release/bin/blender-thumbnailer.py	2012-01-27 00:39:28 +0000
+++ .pc/0001-blender_thumbnailer.patch/release/bin/blender-thumbnailer.py	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-#!/usr/bin/python
-
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-"""
-Thumbnailer runs with python 2.6 and 3.x.
-To run automatically with nautilus:
-   gconftool --type boolean --set /desktop/gnome/thumbnailers/application@x-blender/enable true
-   gconftool --type string --set /desktop/gnome/thumbnailers/application@x-blender/command "blender-thumbnailer.py %u %o"
-"""
-
-import struct
-
-
-def open_wrapper_get():
-    """ wrap OS spesific read functionality here, fallback to 'open()'
-    """
-
-    def open_gio(path, mode):
-        g_file = gio.File(path).read()
-        g_file.orig_seek = g_file.seek
-
-        def new_seek(offset, whence=0):
-            return g_file.orig_seek(offset, [1, 0, 2][whence])
-
-        g_file.seek = new_seek
-        return g_file
-
-    try:
-        import gio
-        return open_gio
-    except ImportError:
-        return open
-
-
-def blend_extract_thumb(path):
-    import os
-    open_wrapper = open_wrapper_get()
-
-    # def MAKE_ID(tag): ord(tag[0])<<24 | ord(tag[1])<<16 | ord(tag[2])<<8 | ord(tag[3])
-    REND = 1145980242  # MAKE_ID(b'REND')
-    TEST = 1414743380  # MAKE_ID(b'TEST')
-
-    blendfile = open_wrapper(path, 'rb')
-
-    head = blendfile.read(12)
-
-    if head[0:2] == b'\x1f\x8b':  # gzip magic
-        import gzip
-        blendfile.close()
-        blendfile = gzip.GzipFile('', 'rb', 0, open_wrapper(path, 'rb'))
-        head = blendfile.read(12)
-
-    if not head.startswith(b'BLENDER'):
-        blendfile.close()
-        return None, 0, 0
-
-    is_64_bit = (head[7] == b'-'[0])
-
-    # true for PPC, false for X86
-    is_big_endian = (head[8] == b'V'[0])
-
-    # blender pre 2.5 had no thumbs
-    if head[9:11] <= b'24':
-        return None, 0, 0
-
-    sizeof_bhead = 24 if is_64_bit else 20
-    int_endian_pair = '>ii' if is_big_endian else '<ii'
-
-    while True:
-        bhead = blendfile.read(sizeof_bhead)
-
-        if len(bhead) < sizeof_bhead:
-            return None, 0, 0
-
-        code, length = struct.unpack(int_endian_pair, bhead[0:8])  # 8 == sizeof(int) * 2
-
-        if code == REND:
-            blendfile.seek(length, os.SEEK_CUR)
-        else:
-            break
-
-    if code != TEST:
-        return None, 0, 0
-
-    try:
-        x, y = struct.unpack(int_endian_pair, blendfile.read(8))  # 8 == sizeof(int) * 2
-    except struct.error:
-        return None, 0, 0
-
-    length -= 8  # sizeof(int) * 2
-
-    if length != x * y * 4:
-        return None, 0, 0
-
-    image_buffer = blendfile.read(length)
-
-    if len(image_buffer) != length:
-        return None, 0, 0
-
-    return image_buffer, x, y
-
-
-def write_png(buf, width, height):
-    import zlib
-
-    # reverse the vertical line order and add null bytes at the start
-    width_byte_4 = width * 4
-    raw_data = b"".join(b'\x00' + buf[span:span + width_byte_4] for span in range((height - 1) * width * 4, -1, - width_byte_4))
-
-    def png_pack(png_tag, data):
-        chunk_head = png_tag + data
-        return struct.pack("!I", len(data)) + chunk_head + struct.pack("!I", 0xFFFFFFFF & zlib.crc32(chunk_head))
-
-    return b"".join([
-        b'\x89PNG\r\n\x1a\n',
-        png_pack(b'IHDR', struct.pack("!2I5B", width, height, 8, 6, 0, 0, 0)),
-        png_pack(b'IDAT', zlib.compress(raw_data, 9)),
-        png_pack(b'IEND', b'')])
-
-
-if __name__ == '__main__':
-    import sys
-
-    if len(sys.argv) < 3:
-        print("Expected 2 arguments <input.blend> <output.png>")
-    else:
-        file_in = sys.argv[-2]
-
-        buf, width, height = blend_extract_thumb(file_in)
-
-        if buf:
-            file_out = sys.argv[-1]
-
-            f = open(file_out, "wb")
-            f.write(write_png(buf, width, height))
-            f.close()
 
=== removed directory '.pc/0001-blender_thumbnailer.patch/source'
=== removed directory '.pc/0001-blender_thumbnailer.patch/source/creator'
=== removed file '.pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt'
--- .pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt	2012-04-28 12:11:12 +0000
+++ .pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,946 +0,0 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-setup_libdirs()
-
-blender_include_dirs(
-	../../intern/guardedalloc
-	../blender/blenlib
-	../blender/blenkernel
-	../blender/blenloader
-	../blender/editors/include
-	../blender/makesrna
-	../blender/imbuf
-	../blender/render/extern/include
-	../blender/makesdna
-	../blender/gpu
-	../blender/windowmanager
-)
-
-if(WIN32)
-	blender_include_dirs(../../intern/utfconv)
-endif()
-
-if(WITH_LIBMV)
-	blender_include_dirs(../../extern/libmv)
-	add_definitions(-DWITH_LIBMV)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	add_definitions(-DWITH_FFMPEG)
-endif()
-
-if(WITH_PYTHON)
-	blender_include_dirs(../blender/python)
-	add_definitions(-DWITH_PYTHON)
-
-	if(WITH_PYTHON_SECURITY)
-		add_definitions(-DWITH_PYTHON_SECURITY)
-	endif()
-endif()
-
-if(WITH_HEADLESS)
-	add_definitions(-DWITH_HEADLESS)
-endif()
-
-if(WITH_GAMEENGINE)
-	blender_include_dirs(../gameengine/BlenderRoutines)
-
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
-if(WITH_SDL)
-	add_definitions(-DWITH_SDL)
-endif()
-
-if(WITH_BINRELOC)
-	add_definitions(-DWITH_BINRELOC)
-	blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
-endif()
-
-# Setup the exe sources and buildinfo
-set(SRC
-	creator.c
-)
-
-# MSVC 2010 gives linking errors with the manifest
-if(WIN32 AND NOT UNIX)
-	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
-	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
-	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
-	if(MINGW)
-		add_definitions(
-			-DWINDRES
-			-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	else()
-		add_definitions(
-			-DBLEN_VER_RC_STR=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	endif()
-
-
-	list(APPEND SRC
-		../icons/winblender.rc
-	)
-endif()
-
-if(WITH_BUILDINFO)
-	add_definitions(-DWITH_BUILDINFO)
-	# --------------------------------------------------------------------------
-	# These defines could all be moved into the header below
-	string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
-	add_definitions(
-		# # define in header now, else these get out of date on rebuilds.
-		# -DBUILD_DATE="${BUILD_DATE}"
-		# -DBUILD_TIME="${BUILD_TIME}"
-		# -DBUILD_REV="${BUILD_REV}"
-		-DWITH_BUILDINFO_HEADER # alternative to lines above
-		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
-		-DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
-		-DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
-		-DBUILD_SYSTEM="CMake"
-	)
-
-	# --------------------------------------------------------------------------
-	# write header for values that change each build
-	# note, generaed file is in build dir's source/creator
-	#       except when used as an include path.
-
-	# include the output directory, where the buildinfo.h file is generated
-	include_directories(${CMAKE_BINARY_DIR}/source/creator)
-
-	# a custom target that is always built
-	add_custom_target(buildinfo ALL
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h)
-
-	# creates svnheader.h using cmake script
-	add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		COMMAND ${CMAKE_COMMAND}
-		-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-		-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
-
-	# buildinfo.h is a generated file
-	set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		PROPERTIES GENERATED TRUE
-		HEADER_FILE_ONLY TRUE)
-
-	# add deps below, after adding blender
-	# -------------- done with header values.
-
-	list(APPEND SRC
-		buildinfo.c
-	)
-endif()
-
-# message(STATUS "Configuring blender")
-if(WITH_PYTHON_MODULE)
-	add_definitions(-DWITH_PYTHON_MODULE)
-
-	# creates ./bin/bpy.so which can be imported as a python module.
-	#
-	# note that 'SHARED' works on Linux and Windows,
-	# but not OSX which _must_ be 'MODULE'
-	add_library(blender MODULE ${SRC})
-	set_target_properties(
-		blender
-		PROPERTIES
-			PREFIX ""
-			OUTPUT_NAME bpy
-			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
-	)
-
-	if(APPLE)
-		set_target_properties(
-			blender
-			PROPERTIES
-				LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
-				LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
-		)
-	endif()
-
-	if(WIN32)
-		# python modules use this
-		set_target_properties(
-			blender
-			PROPERTIES
-			SUFFIX ".pyd"
-		)
-	endif()
-
-else()
-	add_executable(blender ${EXETYPE} ${SRC})
-endif()
-
-if(WITH_BUILDINFO)
-	# explicitly say that the executable depends on the buildinfo
-	add_dependencies(blender buildinfo)
-endif()
-
-# Post build steps for bundling/packaging.
-
-
-if(MSVC_IDE)
-	# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-elseif(APPLE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-else()
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
-endif()
-
-set(BLENDER_TEXT_FILES
-	${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/copyright.txt
-	${CMAKE_SOURCE_DIR}/release/text/readme.html
-)
-
-
-# -----------------------------------------------------------------------------
-# Platform Specific Var: TARGETDIR_VER
-
-if(UNIX AND NOT APPLE)
-	if(WITH_INSTALL_PORTABLE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		if(WITH_PYTHON_MODULE)
-			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
-		else()
-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-		endif()
-	endif()
-
-elseif(WIN32)
-	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-
-elseif(APPLE)
-	if(WITH_PYTHON_MODULE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
-	endif()
-
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Generic, All Platforms)
-
-
-# important to make a clean  install each time, else old scripts get loaded.
-install(
-	CODE
-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
-)
-
-if(WITH_PYTHON)
-	# install(CODE "message(\"copying blender scripts...\")")
-	
-	# exclude addons_contrib if release
-	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
-		set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
-	else()
-		set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
-	endif()
-
-	install(
-		DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
-		DESTINATION ${TARGETDIR_VER}
-		PATTERN ".svn" EXCLUDE
-		PATTERN "__pycache__" EXCLUDE
-		PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
-	)
-	
-	unset(ADDON_EXCLUDE_CONDITIONAL)
-endif()
-
-# localization
-if(WITH_INTERNATIONAL)
-	install(
-		DIRECTORY
-			${CMAKE_SOURCE_DIR}/release/datafiles/locale
-			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
-		DESTINATION ${TARGETDIR_VER}/datafiles
-		PATTERN ".svn" EXCLUDE
-	)
-endif()
-
-# helpful tip when using make
-if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}'
-	)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Platform Specific)
-
-if(UNIX AND NOT APPLE)
-
-	# there are a few differences between portable and system install
-	if(WITH_INSTALL_PORTABLE)
-		install(
-			FILES
-				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-				${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			PROGRAMS
-			${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${TARGETDIR}
-		)
-
-	else()
-		# main blender binary
-		if(WITH_PYTHON_MODULE)
-			install(
-				TARGETS blender
-				LIBRARY
-				DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
-			)
-		else()
-			install(
-				PROGRAMS ${TARGETDIR}/blender
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-
-		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			install(
-				PROGRAMS ${TARGETDIR}/blenderplayer
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-		# misc files
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-		)
-		install(
-			DIRECTORY
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.svg" EXCLUDE
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
-		)
-		install(
-			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-		)
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
-		)
-	endif()
-
-		# plugins in blender 2.6 don't work at the moment.
-		#
-		# install(
-		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-		# 	DESTINATION ${TARGETDIR_VER}
-		# 	PATTERN ".svn" EXCLUDE
-		# )
-
-	if(WITH_PYTHON)
-		if(WITH_PYTHON_INSTALL)
-			# on some platforms (like openSUSE) Python is linked
-			# to be used from lib64 folder.
-			# determine this from Python's libraries path
-			if(${PYTHON_LIBPATH} MATCHES "lib64$")
-				set(_target_LIB "lib64")
-			else()
-				set(_target_LIB "lib")
-			endif()
-
-			# Copy the systems python into the install directory
-			# Scons copy in tools/Blender.py
-			# install(CODE "message(\"copying a subset of the systems python...\")")
-			install(
-				DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
-				DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
-				PATTERN ".svn" EXCLUDE
-				PATTERN "__pycache__" EXCLUDE               # * any cache *
-				PATTERN "distutils" EXCLUDE                 # ./distutils
-				PATTERN "lib2to3" EXCLUDE                   # ./lib2to3
-				PATTERN "config" EXCLUDE                    # ./config
-				PATTERN "config-*" EXCLUDE                  # ./config-*
-				PATTERN "site-packages/*" EXCLUDE           # ./site-packages/*
-				PATTERN "tkinter" EXCLUDE                   # ./tkinter
-				PATTERN "lib-dynload/_tkinter.*" EXCLUDE    # ./lib-dynload/_tkinter.co
-				PATTERN "idlelib" EXCLUDE                   # ./idlelib
-				PATTERN "test" EXCLUDE                      # ./test
-				PATTERN "turtledemo" EXCLUDE                # ./turtledemo
-				PATTERN "turtle.py" EXCLUDE					# ./turtle.py
-			)
-
-			# # doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-			unset(_target_LIB)
-		endif()
-	endif()
-elseif(WIN32)
-
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
-		install(
-			FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/iconv/lib/iconv.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	# plugins in blender 2.6 don't work at the moment.
-	#
-	# install(
-	# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-	# 	DESTINATION ${TARGETDIR_VER}
-	# 	PATTERN ".svn" EXCLUDE
-	# )
-
-	if(WITH_PYTHON)
-		set_lib_path(PYLIB "python/lib")
-		install(
-			FILES ${PYLIB}/python32.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-		)
-
-		install(
-			FILES ${PYLIB}/python32_d.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Debug
-		)
-
-		if(WITH_PYTHON_INSTALL)
-			# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
-
-			# create the directory in multiple steps, so it actually gets created when it doesn't exist yet
-			install(
-				CODE
-				"
-				message(\"creating ${TARGETDIR_VER}/python/lib\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\")
-				message(\"done creating dir\")
-				"
-			)
-
-			install(
-				CODE
-				"
-				if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\")
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
-				else()
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
-				endif()
-				"
-			)
-
-			# doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-		endif()
-	endif()
-
-	if(CMAKE_CL_64)
-		# gettext and png are statically linked on win64
-		install(
-			FILES ${LIBDIR}/zlib/lib/zlib.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#not needed since we link statically, maybe also unneeded for MinGW?
-		if(NOT WITH_MINGW64)
-			install(
-				FILES
-					${LIBDIR}/zlib/lib/zlib.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(MSVC)
-		install(
-			FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
-		if(NOT WITH_MINGW64)
-			install(
-				FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(WITH_CODEC_FFMPEG)
-		install(
-			FILES
-				${LIBDIR}/ffmpeg/lib/avcodec-53.dll
-				${LIBDIR}/ffmpeg/lib/avformat-53.dll
-				${LIBDIR}/ffmpeg/lib/avdevice-53.dll
-				${LIBDIR}/ffmpeg/lib/avutil-51.dll
-				${LIBDIR}/ffmpeg/lib/swscale-2.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-	endif()
-
-	if(WITH_CODEC_SNDFILE)
-		install(
-			FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_OPENAL)
-		install(
-			FILES
-				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_SDL)
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/sdl/lib/SDL.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(NOT CMAKE_CL_64)
-		install(
-			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-		
-	install( # x86 builds can run on x64 Windows, so this is required at all times
-		FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
-		DESTINATION ${TARGETDIR}
-	)	
-
-	if(WITH_OPENIMAGEIO)
-		if(NOT MINGW)
-			set_lib_path(OIIOBIN "openimageio/bin")
-			install(
-				FILES
-					${OIIOBIN}/OpenImageIO.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-elseif(APPLE)
-
-	# handy install macro to exclude files, we use \$ escape for the "to"
-	# argument when calling so ${BUILD_TYPE} does not get expanded
-	macro(install_dir from to)
-		install(
-			DIRECTORY ${from}
-			DESTINATION ${to}
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.pyc" EXCLUDE
-			PATTERN "*.pyo" EXCLUDE
-			PATTERN "*.orig" EXCLUDE
-			PATTERN "*.rej" EXCLUDE
-			PATTERN "__pycache__" EXCLUDE
-			PATTERN "__MACOSX" EXCLUDE
-			PATTERN ".DS_Store" EXCLUDE
-		)
-	endmacro()
-
-	set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-
-	# setup Info.plist
-	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-	set_target_properties(blender PROPERTIES
-		MACOSX_BUNDLE_INFO_PLIST ${OSX_APP_SOURCEDIR}/Contents/Info.plist
-		MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
-		MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
-
-
-	# install release and app files
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	install(
-		FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
-		DESTINATION ${TARGETDIR}/blender.app/Contents
-	)
-
-	install_dir(
-		${OSX_APP_SOURCEDIR}/Contents/Resources
-		\${TARGETDIR}/blender.app/Contents/
-	)
-
-	# python
-	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
-		# the python zip is first extract as part of the build process,
-		# and then later installed as part of make install. this is much
-		# quicker, and means we can easily exclude files on copy
-		# Not needed for PYTHON_MODULE or WEB_PLUGIN due uses  Pyhon framework
-		add_custom_target(
-			extractpyzip
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
-
-		set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-
-		add_custom_command(
-			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-			COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-			DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-		add_dependencies(blender extractpyzip)
-
-		# copy extracted python files
-		install_dir(
-			${CMAKE_CURRENT_BINARY_DIR}/python
-			\${TARGETDIR_VER}
-		)
-
-	endif()
-
-	# install blenderplayer bundle - copy of blender.app above. re-using macros et al
-	# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
-	if(WITH_GAMEENGINE AND WITH_PLAYER)
-		set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
-		set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
-		set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})
-
-
-		# important to make a clean  install each time else old scripts get loaded.
-		install(
-			CODE
-			"file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
-		)
-
-		install(
-			FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
-			DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
-		)
-
-		install_dir(
-			${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
-			\${TARGETDIR}/blenderplayer.app/Contents/
-		)
-
-		# python
-		if(WITH_PYTHON)
-			add_custom_command(
-				OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-				COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-				DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-			# copy extracted python files
-			install_dir(
-				${CMAKE_CURRENT_BINARY_DIR}/python
-				\${PLAYER_TARGETDIR_VER}
-			)
-		endif()
-
-	endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# Generic Install, for all targets
-
-
-
-# install more files specified elsewhere
-delayed_do_install(${TARGETDIR_VER})
-
-unset(BLENDER_TEXT_FILES)
-
-
-# -----------------------------------------------------------------------------
-# Setup link libs
-
-add_dependencies(blender makesdna)
-
-get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
-
-set(BLENDER_LINK_LIBS
-	${BLENDER_LINK_LIBS}
-	bf_windowmanager
-	bf_render
-)
-
-if(WITH_MOD_FLUID)
-	list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-endif()
-
-if(WITH_CYCLES)
-	list(APPEND BLENDER_LINK_LIBS
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd)
-endif()
-
-#if(UNIX)
-	# Sort libraries
-	set(BLENDER_SORTED_LIBS
-		bf_windowmanager
-
-		bf_editor_space_api
-		bf_editor_space_action
-		bf_editor_space_buttons
-		bf_editor_space_console
-		bf_editor_space_file
-		bf_editor_space_graph
-		bf_editor_space_image
-		bf_editor_space_info
-		bf_editor_space_logic
-		bf_editor_space_nla
-		bf_editor_space_node
-		bf_editor_space_outliner
-		bf_editor_space_script
-		bf_editor_space_sequencer
-		bf_editor_space_time
-		bf_editor_space_userpref
-		bf_editor_space_view3d
-		bf_editor_space_clip
-
-		bf_editor_text
-		bf_editor_transform
-		bf_editor_util
-		bf_editor_uvedit
-		bf_editor_curve
-		bf_editor_armature
-		bf_editor_gpencil
-		bf_editor_interface
-		bf_editor_mesh
-		bf_editor_metaball
-		bf_editor_object
-		bf_editor_physics
-		bf_editor_render
-		bf_editor_screen
-		bf_editor_sculpt_paint
-		bf_editor_sound
-		bf_editor_animation
-		bf_editor_datafiles
-
-		bf_render
-		bf_intern_opennl
-		bf_python
-		bf_python_ext
-		bf_python_mathutils
-		bf_python_bmesh
-		bf_ikplugin
-		bf_modifiers
-		bf_bmesh
-		bf_blenkernel
-		bf_nodes
-		bf_gpu
-		bf_blenloader
-		bf_imbuf
-		bf_blenlib
-		bf_intern_ghost
-		bf_intern_string
-		bf_blenpluginapi
-		bf_avi
-		bf_imbuf_cineon
-		bf_imbuf_openexr
-		bf_imbuf_dds
-		bf_collada
-		bf_intern_bsp
-		bf_intern_bop
-		bf_intern_decimate
-		bf_intern_elbeem
-		bf_intern_ik
-		bf_intern_memutil
-		bf_intern_guardedalloc
-		bf_intern_ctr
-		bf_intern_utfconv
-		ge_blen_routines
-		ge_converter
-		ge_phys_dummy
-		ge_phys_bullet
-		bf_intern_smoke
-		extern_minilzo
-		extern_lzma
-		extern_colamd
-		ge_logic_ketsji
-		extern_recastnavigation
-		ge_phys_common
-		ge_logic
-		ge_rasterizer
-		ge_oglrasterizer
-		ge_logic_expressions
-		ge_scenegraph
-		ge_logic_network
-		ge_logic_ngnetwork
-		extern_bullet
-		ge_logic_loopbacknetwork
-		bf_intern_moto
-		extern_openjpeg
-		extern_redcode
-		ge_videotex
-		bf_rna
-		bf_dna
-		bf_blenfont
-		bf_intern_audaspace
-		bf_intern_mikktspace
-		bf_intern_dualcon
-		bf_intern_cycles
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd
-	)
-
-	if(WITH_LIBMV)
-		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
-	endif()
-
-	if(WITH_MOD_CLOTH_ELTOPO)
-		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-	endif()
-
-	if(WITH_BUILTIN_GLEW)
-		list(APPEND BLENDER_SORTED_LIBS extern_glew)
-	endif()
-
-	if(WITH_BINRELOC)
-		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
-	endif()
-
-	if(WITH_CXX_GUARDEDALLOC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	endif()
-
-	if(WITH_IK_ITASC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
-	endif()
-
-	if(WITH_CODEC_QUICKTIME)
-		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	endif()
-
-	if(WITH_CARVE)
-		list(APPEND BLENDER_SORTED_LIBS extern_carve)
-	endif()
-
-	if(WITH_GHOST_XDND)
-		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
-	endif()
-
-	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		set(REMLIB ${SORTLIB})
-		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				set(REMLIB "")
-			endif()
-		endforeach()
-		if(REMLIB)
-			# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-			list(APPEND REM_MSG ${REMLIB})
-			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		endif()
-	endforeach()
-	if(REM_MSG)
-		list(SORT REM_MSG)
-		message(STATUS "Blender Skipping: (${REM_MSG})")
-	endif()
-	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-
-	unset(SEARCHLIB)
-	unset(SORTLIB)
-	unset(REMLIB)
-	unset(REM_MSG)
-
-#else()
-#	target_link_libraries(blender ${BLENDER_LINK_LIBS})
-#endif()
-
-setup_liblinks(blender)
 
=== removed directory '.pc/0002-disable_tests.patch'
=== removed directory '.pc/0002-disable_tests.patch/source'
=== removed file '.pc/0002-disable_tests.patch/source/CMakeLists.txt'
--- .pc/0002-disable_tests.patch/source/CMakeLists.txt	2012-03-12 19:04:53 +0000
+++ .pc/0002-disable_tests.patch/source/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-add_subdirectory(blender)
-
-if(WITH_GAMEENGINE)
-	add_subdirectory(gameengine)
-endif()
-	
-if(WINDOWS)
-	add_subdirectory(icons)
-endif()
-
-add_subdirectory(tests)
 
=== removed directory '.pc/0003-install_in_usr_lib.patch'
=== removed directory '.pc/0003-install_in_usr_lib.patch/intern'
=== removed directory '.pc/0003-install_in_usr_lib.patch/intern/ghost'
=== removed directory '.pc/0003-install_in_usr_lib.patch/intern/ghost/intern'
=== removed file '.pc/0003-install_in_usr_lib.patch/intern/ghost/intern/GHOST_SystemPathsX11.cpp'
--- .pc/0003-install_in_usr_lib.patch/intern/ghost/intern/GHOST_SystemPathsX11.cpp	2012-04-28 12:11:12 +0000
+++ .pc/0003-install_in_usr_lib.patch/intern/ghost/intern/GHOST_SystemPathsX11.cpp	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2010 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file ghost/intern/GHOST_SystemPathsX11.cpp
- *  \ingroup GHOST
- */
-
-
-#include "GHOST_SystemPathsX11.h"
-
-#include "GHOST_Debug.h"
-
-// For timing
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <stdio.h> // for fprintf only
-#include <cstdlib> // for exit
-
-#ifdef WITH_XDG_USER_DIRS
-#  include <pwd.h> // for get home without use getenv()
-#  include <limits.h> // for PATH_MAX
-#endif
-
-#ifdef PREFIX
-static const char *static_path= PREFIX "/share";
-#else
-static const char *static_path= NULL;
-#endif
-
-GHOST_SystemPathsX11::GHOST_SystemPathsX11()
-{
-}
-
-GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
-{
-}
-
-const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const
-{
-	/* no prefix assumes a portable build which only uses bundled scripts */
-	return (const GHOST_TUns8 *)static_path;
-}
-
-const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const
-{
-#ifndef WITH_XDG_USER_DIRS
-	return (const GHOST_TUns8 *)getenv("HOME");
-#else /* WITH_XDG_USER_DIRS */
-	const char *home= getenv("XDG_CONFIG_HOME");
-
-	if (home) {
-		return (const GHOST_TUns8 *)home;
-	}
-	else {
-		static char user_path[PATH_MAX];
-
-		home= getenv("HOME");
-
-		if (home == NULL) {
-			home= getpwuid(getuid())->pw_dir;
-		}
-
-		snprintf(user_path, sizeof(user_path), "%s/.config", home);
-		return (const GHOST_TUns8 *)user_path;
-	}
-#endif /* WITH_XDG_USER_DIRS */
-}
-
-const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const
-{
-	return NULL;
-}
-
-void GHOST_SystemPathsX11::addToSystemRecentFiles(const char* filename) const
-{
-	/* XXXXX TODO: Implementation for X11 if possible */
-
-}
 
=== removed directory '.pc/0003-install_in_usr_lib.patch/source'
=== removed directory '.pc/0003-install_in_usr_lib.patch/source/creator'
=== removed file '.pc/0003-install_in_usr_lib.patch/source/creator/CMakeLists.txt'
--- .pc/0003-install_in_usr_lib.patch/source/creator/CMakeLists.txt	2012-04-28 12:11:12 +0000
+++ .pc/0003-install_in_usr_lib.patch/source/creator/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,946 +0,0 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-setup_libdirs()
-
-blender_include_dirs(
-	../../intern/guardedalloc
-	../blender/blenlib
-	../blender/blenkernel
-	../blender/blenloader
-	../blender/editors/include
-	../blender/makesrna
-	../blender/imbuf
-	../blender/render/extern/include
-	../blender/makesdna
-	../blender/gpu
-	../blender/windowmanager
-)
-
-if(WIN32)
-	blender_include_dirs(../../intern/utfconv)
-endif()
-
-if(WITH_LIBMV)
-	blender_include_dirs(../../extern/libmv)
-	add_definitions(-DWITH_LIBMV)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	add_definitions(-DWITH_FFMPEG)
-endif()
-
-if(WITH_PYTHON)
-	blender_include_dirs(../blender/python)
-	add_definitions(-DWITH_PYTHON)
-
-	if(WITH_PYTHON_SECURITY)
-		add_definitions(-DWITH_PYTHON_SECURITY)
-	endif()
-endif()
-
-if(WITH_HEADLESS)
-	add_definitions(-DWITH_HEADLESS)
-endif()
-
-if(WITH_GAMEENGINE)
-	blender_include_dirs(../gameengine/BlenderRoutines)
-
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
-if(WITH_SDL)
-	add_definitions(-DWITH_SDL)
-endif()
-
-if(WITH_BINRELOC)
-	add_definitions(-DWITH_BINRELOC)
-	blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
-endif()
-
-# Setup the exe sources and buildinfo
-set(SRC
-	creator.c
-)
-
-# MSVC 2010 gives linking errors with the manifest
-if(WIN32 AND NOT UNIX)
-	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
-	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
-	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
-	if(MINGW)
-		add_definitions(
-			-DWINDRES
-			-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	else()
-		add_definitions(
-			-DBLEN_VER_RC_STR=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	endif()
-
-
-	list(APPEND SRC
-		../icons/winblender.rc
-	)
-endif()
-
-if(WITH_BUILDINFO)
-	add_definitions(-DWITH_BUILDINFO)
-	# --------------------------------------------------------------------------
-	# These defines could all be moved into the header below
-	string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
-	add_definitions(
-		# # define in header now, else these get out of date on rebuilds.
-		# -DBUILD_DATE="${BUILD_DATE}"
-		# -DBUILD_TIME="${BUILD_TIME}"
-		# -DBUILD_REV="${BUILD_REV}"
-		-DWITH_BUILDINFO_HEADER # alternative to lines above
-		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
-		-DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
-		-DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
-		-DBUILD_SYSTEM="CMake"
-	)
-
-	# --------------------------------------------------------------------------
-	# write header for values that change each build
-	# note, generaed file is in build dir's source/creator
-	#       except when used as an include path.
-
-	# include the output directory, where the buildinfo.h file is generated
-	include_directories(${CMAKE_BINARY_DIR}/source/creator)
-
-	# a custom target that is always built
-	add_custom_target(buildinfo ALL
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h)
-
-	# creates svnheader.h using cmake script
-	add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		COMMAND ${CMAKE_COMMAND}
-		-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-		-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
-
-	# buildinfo.h is a generated file
-	set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		PROPERTIES GENERATED TRUE
-		HEADER_FILE_ONLY TRUE)
-
-	# add deps below, after adding blender
-	# -------------- done with header values.
-
-	list(APPEND SRC
-		buildinfo.c
-	)
-endif()
-
-# message(STATUS "Configuring blender")
-if(WITH_PYTHON_MODULE)
-	add_definitions(-DWITH_PYTHON_MODULE)
-
-	# creates ./bin/bpy.so which can be imported as a python module.
-	#
-	# note that 'SHARED' works on Linux and Windows,
-	# but not OSX which _must_ be 'MODULE'
-	add_library(blender MODULE ${SRC})
-	set_target_properties(
-		blender
-		PROPERTIES
-			PREFIX ""
-			OUTPUT_NAME bpy
-			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
-	)
-
-	if(APPLE)
-		set_target_properties(
-			blender
-			PROPERTIES
-				LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
-				LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
-		)
-	endif()
-
-	if(WIN32)
-		# python modules use this
-		set_target_properties(
-			blender
-			PROPERTIES
-			SUFFIX ".pyd"
-		)
-	endif()
-
-else()
-	add_executable(blender ${EXETYPE} ${SRC})
-endif()
-
-if(WITH_BUILDINFO)
-	# explicitly say that the executable depends on the buildinfo
-	add_dependencies(blender buildinfo)
-endif()
-
-# Post build steps for bundling/packaging.
-
-
-if(MSVC_IDE)
-	# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-elseif(APPLE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-else()
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
-endif()
-
-set(BLENDER_TEXT_FILES
-	${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/copyright.txt
-	${CMAKE_SOURCE_DIR}/release/text/readme.html
-)
-
-
-# -----------------------------------------------------------------------------
-# Platform Specific Var: TARGETDIR_VER
-
-if(UNIX AND NOT APPLE)
-	if(WITH_INSTALL_PORTABLE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		if(WITH_PYTHON_MODULE)
-			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
-		else()
-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-		endif()
-	endif()
-
-elseif(WIN32)
-	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-
-elseif(APPLE)
-	if(WITH_PYTHON_MODULE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
-	endif()
-
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Generic, All Platforms)
-
-
-# important to make a clean  install each time, else old scripts get loaded.
-install(
-	CODE
-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
-)
-
-if(WITH_PYTHON)
-	# install(CODE "message(\"copying blender scripts...\")")
-	
-	# exclude addons_contrib if release
-	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
-		set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
-	else()
-		set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
-	endif()
-
-	install(
-		DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
-		DESTINATION ${TARGETDIR_VER}
-		PATTERN ".svn" EXCLUDE
-		PATTERN "__pycache__" EXCLUDE
-		PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
-	)
-	
-	unset(ADDON_EXCLUDE_CONDITIONAL)
-endif()
-
-# localization
-if(WITH_INTERNATIONAL)
-	install(
-		DIRECTORY
-			${CMAKE_SOURCE_DIR}/release/datafiles/locale
-			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
-		DESTINATION ${TARGETDIR_VER}/datafiles
-		PATTERN ".svn" EXCLUDE
-	)
-endif()
-
-# helpful tip when using make
-if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}'
-	)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Platform Specific)
-
-if(UNIX AND NOT APPLE)
-
-	# there are a few differences between portable and system install
-	if(WITH_INSTALL_PORTABLE)
-		install(
-			FILES
-				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-				${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			PROGRAMS
-			${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${TARGETDIR}
-		)
-
-	else()
-		# main blender binary
-		if(WITH_PYTHON_MODULE)
-			install(
-				TARGETS blender
-				LIBRARY
-				DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
-			)
-		else()
-			install(
-				PROGRAMS ${TARGETDIR}/blender
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-
-		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			install(
-				PROGRAMS ${TARGETDIR}/blenderplayer
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-		# misc files
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-		)
-		install(
-			DIRECTORY
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.svg" EXCLUDE
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
-		)
-		install(
-			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-		)
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
-		)
-	endif()
-
-		# plugins in blender 2.6 don't work at the moment.
-		#
-		# install(
-		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-		# 	DESTINATION ${TARGETDIR_VER}
-		# 	PATTERN ".svn" EXCLUDE
-		# )
-
-	if(WITH_PYTHON)
-		if(WITH_PYTHON_INSTALL)
-			# on some platforms (like openSUSE) Python is linked
-			# to be used from lib64 folder.
-			# determine this from Python's libraries path
-			if(${PYTHON_LIBPATH} MATCHES "lib64$")
-				set(_target_LIB "lib64")
-			else()
-				set(_target_LIB "lib")
-			endif()
-
-			# Copy the systems python into the install directory
-			# Scons copy in tools/Blender.py
-			# install(CODE "message(\"copying a subset of the systems python...\")")
-			install(
-				DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
-				DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
-				PATTERN ".svn" EXCLUDE
-				PATTERN "__pycache__" EXCLUDE               # * any cache *
-				PATTERN "distutils" EXCLUDE                 # ./distutils
-				PATTERN "lib2to3" EXCLUDE                   # ./lib2to3
-				PATTERN "config" EXCLUDE                    # ./config
-				PATTERN "config-*" EXCLUDE                  # ./config-*
-				PATTERN "site-packages/*" EXCLUDE           # ./site-packages/*
-				PATTERN "tkinter" EXCLUDE                   # ./tkinter
-				PATTERN "lib-dynload/_tkinter.*" EXCLUDE    # ./lib-dynload/_tkinter.co
-				PATTERN "idlelib" EXCLUDE                   # ./idlelib
-				PATTERN "test" EXCLUDE                      # ./test
-				PATTERN "turtledemo" EXCLUDE                # ./turtledemo
-				PATTERN "turtle.py" EXCLUDE					# ./turtle.py
-			)
-
-			# # doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-			unset(_target_LIB)
-		endif()
-	endif()
-elseif(WIN32)
-
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
-		install(
-			FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/iconv/lib/iconv.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	# plugins in blender 2.6 don't work at the moment.
-	#
-	# install(
-	# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-	# 	DESTINATION ${TARGETDIR_VER}
-	# 	PATTERN ".svn" EXCLUDE
-	# )
-
-	if(WITH_PYTHON)
-		set_lib_path(PYLIB "python/lib")
-		install(
-			FILES ${PYLIB}/python32.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-		)
-
-		install(
-			FILES ${PYLIB}/python32_d.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Debug
-		)
-
-		if(WITH_PYTHON_INSTALL)
-			# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
-
-			# create the directory in multiple steps, so it actually gets created when it doesn't exist yet
-			install(
-				CODE
-				"
-				message(\"creating ${TARGETDIR_VER}/python/lib\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\")
-				message(\"done creating dir\")
-				"
-			)
-
-			install(
-				CODE
-				"
-				if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\")
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
-				else()
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
-				endif()
-				"
-			)
-
-			# doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-		endif()
-	endif()
-
-	if(CMAKE_CL_64)
-		# gettext and png are statically linked on win64
-		install(
-			FILES ${LIBDIR}/zlib/lib/zlib.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#not needed since we link statically, maybe also unneeded for MinGW?
-		if(NOT WITH_MINGW64)
-			install(
-				FILES
-					${LIBDIR}/zlib/lib/zlib.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(MSVC)
-		install(
-			FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
-		if(NOT WITH_MINGW64)
-			install(
-				FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(WITH_CODEC_FFMPEG)
-		install(
-			FILES
-				${LIBDIR}/ffmpeg/lib/avcodec-53.dll
-				${LIBDIR}/ffmpeg/lib/avformat-53.dll
-				${LIBDIR}/ffmpeg/lib/avdevice-53.dll
-				${LIBDIR}/ffmpeg/lib/avutil-51.dll
-				${LIBDIR}/ffmpeg/lib/swscale-2.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-	endif()
-
-	if(WITH_CODEC_SNDFILE)
-		install(
-			FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_OPENAL)
-		install(
-			FILES
-				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_SDL)
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/sdl/lib/SDL.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(NOT CMAKE_CL_64)
-		install(
-			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-		
-	install( # x86 builds can run on x64 Windows, so this is required at all times
-		FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
-		DESTINATION ${TARGETDIR}
-	)	
-
-	if(WITH_OPENIMAGEIO)
-		if(NOT MINGW)
-			set_lib_path(OIIOBIN "openimageio/bin")
-			install(
-				FILES
-					${OIIOBIN}/OpenImageIO.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-elseif(APPLE)
-
-	# handy install macro to exclude files, we use \$ escape for the "to"
-	# argument when calling so ${BUILD_TYPE} does not get expanded
-	macro(install_dir from to)
-		install(
-			DIRECTORY ${from}
-			DESTINATION ${to}
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.pyc" EXCLUDE
-			PATTERN "*.pyo" EXCLUDE
-			PATTERN "*.orig" EXCLUDE
-			PATTERN "*.rej" EXCLUDE
-			PATTERN "__pycache__" EXCLUDE
-			PATTERN "__MACOSX" EXCLUDE
-			PATTERN ".DS_Store" EXCLUDE
-		)
-	endmacro()
-
-	set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-
-	# setup Info.plist
-	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-	set_target_properties(blender PROPERTIES
-		MACOSX_BUNDLE_INFO_PLIST ${OSX_APP_SOURCEDIR}/Contents/Info.plist
-		MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
-		MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
-
-
-	# install release and app files
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	install(
-		FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
-		DESTINATION ${TARGETDIR}/blender.app/Contents
-	)
-
-	install_dir(
-		${OSX_APP_SOURCEDIR}/Contents/Resources
-		\${TARGETDIR}/blender.app/Contents/
-	)
-
-	# python
-	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
-		# the python zip is first extract as part of the build process,
-		# and then later installed as part of make install. this is much
-		# quicker, and means we can easily exclude files on copy
-		# Not needed for PYTHON_MODULE or WEB_PLUGIN due uses  Pyhon framework
-		add_custom_target(
-			extractpyzip
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
-
-		set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-
-		add_custom_command(
-			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-			COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-			DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-		add_dependencies(blender extractpyzip)
-
-		# copy extracted python files
-		install_dir(
-			${CMAKE_CURRENT_BINARY_DIR}/python
-			\${TARGETDIR_VER}
-		)
-
-	endif()
-
-	# install blenderplayer bundle - copy of blender.app above. re-using macros et al
-	# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
-	if(WITH_GAMEENGINE AND WITH_PLAYER)
-		set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
-		set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
-		set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})
-
-
-		# important to make a clean  install each time else old scripts get loaded.
-		install(
-			CODE
-			"file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
-		)
-
-		install(
-			FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
-			DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
-		)
-
-		install_dir(
-			${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
-			\${TARGETDIR}/blenderplayer.app/Contents/
-		)
-
-		# python
-		if(WITH_PYTHON)
-			add_custom_command(
-				OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-				COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-				DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-			# copy extracted python files
-			install_dir(
-				${CMAKE_CURRENT_BINARY_DIR}/python
-				\${PLAYER_TARGETDIR_VER}
-			)
-		endif()
-
-	endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# Generic Install, for all targets
-
-
-
-# install more files specified elsewhere
-delayed_do_install(${TARGETDIR_VER})
-
-unset(BLENDER_TEXT_FILES)
-
-
-# -----------------------------------------------------------------------------
-# Setup link libs
-
-add_dependencies(blender makesdna)
-
-get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
-
-set(BLENDER_LINK_LIBS
-	${BLENDER_LINK_LIBS}
-	bf_windowmanager
-	bf_render
-)
-
-if(WITH_MOD_FLUID)
-	list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-endif()
-
-if(WITH_CYCLES)
-	list(APPEND BLENDER_LINK_LIBS
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd)
-endif()
-
-#if(UNIX)
-	# Sort libraries
-	set(BLENDER_SORTED_LIBS
-		bf_windowmanager
-
-		bf_editor_space_api
-		bf_editor_space_action
-		bf_editor_space_buttons
-		bf_editor_space_console
-		bf_editor_space_file
-		bf_editor_space_graph
-		bf_editor_space_image
-		bf_editor_space_info
-		bf_editor_space_logic
-		bf_editor_space_nla
-		bf_editor_space_node
-		bf_editor_space_outliner
-		bf_editor_space_script
-		bf_editor_space_sequencer
-		bf_editor_space_time
-		bf_editor_space_userpref
-		bf_editor_space_view3d
-		bf_editor_space_clip
-
-		bf_editor_text
-		bf_editor_transform
-		bf_editor_util
-		bf_editor_uvedit
-		bf_editor_curve
-		bf_editor_armature
-		bf_editor_gpencil
-		bf_editor_interface
-		bf_editor_mesh
-		bf_editor_metaball
-		bf_editor_object
-		bf_editor_physics
-		bf_editor_render
-		bf_editor_screen
-		bf_editor_sculpt_paint
-		bf_editor_sound
-		bf_editor_animation
-		bf_editor_datafiles
-
-		bf_render
-		bf_intern_opennl
-		bf_python
-		bf_python_ext
-		bf_python_mathutils
-		bf_python_bmesh
-		bf_ikplugin
-		bf_modifiers
-		bf_bmesh
-		bf_blenkernel
-		bf_nodes
-		bf_gpu
-		bf_blenloader
-		bf_imbuf
-		bf_blenlib
-		bf_intern_ghost
-		bf_intern_string
-		bf_blenpluginapi
-		bf_avi
-		bf_imbuf_cineon
-		bf_imbuf_openexr
-		bf_imbuf_dds
-		bf_collada
-		bf_intern_bsp
-		bf_intern_bop
-		bf_intern_decimate
-		bf_intern_elbeem
-		bf_intern_ik
-		bf_intern_memutil
-		bf_intern_guardedalloc
-		bf_intern_ctr
-		bf_intern_utfconv
-		ge_blen_routines
-		ge_converter
-		ge_phys_dummy
-		ge_phys_bullet
-		bf_intern_smoke
-		extern_minilzo
-		extern_lzma
-		extern_colamd
-		ge_logic_ketsji
-		extern_recastnavigation
-		ge_phys_common
-		ge_logic
-		ge_rasterizer
-		ge_oglrasterizer
-		ge_logic_expressions
-		ge_scenegraph
-		ge_logic_network
-		ge_logic_ngnetwork
-		extern_bullet
-		ge_logic_loopbacknetwork
-		bf_intern_moto
-		extern_openjpeg
-		extern_redcode
-		ge_videotex
-		bf_rna
-		bf_dna
-		bf_blenfont
-		bf_intern_audaspace
-		bf_intern_mikktspace
-		bf_intern_dualcon
-		bf_intern_cycles
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd
-	)
-
-	if(WITH_LIBMV)
-		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
-	endif()
-
-	if(WITH_MOD_CLOTH_ELTOPO)
-		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-	endif()
-
-	if(WITH_BUILTIN_GLEW)
-		list(APPEND BLENDER_SORTED_LIBS extern_glew)
-	endif()
-
-	if(WITH_BINRELOC)
-		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
-	endif()
-
-	if(WITH_CXX_GUARDEDALLOC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	endif()
-
-	if(WITH_IK_ITASC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
-	endif()
-
-	if(WITH_CODEC_QUICKTIME)
-		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	endif()
-
-	if(WITH_CARVE)
-		list(APPEND BLENDER_SORTED_LIBS extern_carve)
-	endif()
-
-	if(WITH_GHOST_XDND)
-		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
-	endif()
-
-	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		set(REMLIB ${SORTLIB})
-		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				set(REMLIB "")
-			endif()
-		endforeach()
-		if(REMLIB)
-			# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-			list(APPEND REM_MSG ${REMLIB})
-			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		endif()
-	endforeach()
-	if(REM_MSG)
-		list(SORT REM_MSG)
-		message(STATUS "Blender Skipping: (${REM_MSG})")
-	endif()
-	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-
-	unset(SEARCHLIB)
-	unset(SORTLIB)
-	unset(REMLIB)
-	unset(REM_MSG)
-
-#else()
-#	target_link_libraries(blender ${BLENDER_LINK_LIBS})
-#endif()
-
-setup_liblinks(blender)
 
=== removed directory '.pc/0004-filter_docs_to_install.patch'
=== removed directory '.pc/0004-filter_docs_to_install.patch/source'
=== removed directory '.pc/0004-filter_docs_to_install.patch/source/creator'
=== removed file '.pc/0004-filter_docs_to_install.patch/source/creator/CMakeLists.txt'
--- .pc/0004-filter_docs_to_install.patch/source/creator/CMakeLists.txt	2012-04-28 12:11:12 +0000
+++ .pc/0004-filter_docs_to_install.patch/source/creator/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,946 +0,0 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-setup_libdirs()
-
-blender_include_dirs(
-	../../intern/guardedalloc
-	../blender/blenlib
-	../blender/blenkernel
-	../blender/blenloader
-	../blender/editors/include
-	../blender/makesrna
-	../blender/imbuf
-	../blender/render/extern/include
-	../blender/makesdna
-	../blender/gpu
-	../blender/windowmanager
-)
-
-if(WIN32)
-	blender_include_dirs(../../intern/utfconv)
-endif()
-
-if(WITH_LIBMV)
-	blender_include_dirs(../../extern/libmv)
-	add_definitions(-DWITH_LIBMV)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	add_definitions(-DWITH_FFMPEG)
-endif()
-
-if(WITH_PYTHON)
-	blender_include_dirs(../blender/python)
-	add_definitions(-DWITH_PYTHON)
-
-	if(WITH_PYTHON_SECURITY)
-		add_definitions(-DWITH_PYTHON_SECURITY)
-	endif()
-endif()
-
-if(WITH_HEADLESS)
-	add_definitions(-DWITH_HEADLESS)
-endif()
-
-if(WITH_GAMEENGINE)
-	blender_include_dirs(../gameengine/BlenderRoutines)
-
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
-if(WITH_SDL)
-	add_definitions(-DWITH_SDL)
-endif()
-
-if(WITH_BINRELOC)
-	add_definitions(-DWITH_BINRELOC)
-	blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
-endif()
-
-# Setup the exe sources and buildinfo
-set(SRC
-	creator.c
-)
-
-# MSVC 2010 gives linking errors with the manifest
-if(WIN32 AND NOT UNIX)
-	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
-	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
-	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
-	if(MINGW)
-		add_definitions(
-			-DWINDRES
-			-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	else()
-		add_definitions(
-			-DBLEN_VER_RC_STR=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	endif()
-
-
-	list(APPEND SRC
-		../icons/winblender.rc
-	)
-endif()
-
-if(WITH_BUILDINFO)
-	add_definitions(-DWITH_BUILDINFO)
-	# --------------------------------------------------------------------------
-	# These defines could all be moved into the header below
-	string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
-	add_definitions(
-		# # define in header now, else these get out of date on rebuilds.
-		# -DBUILD_DATE="${BUILD_DATE}"
-		# -DBUILD_TIME="${BUILD_TIME}"
-		# -DBUILD_REV="${BUILD_REV}"
-		-DWITH_BUILDINFO_HEADER # alternative to lines above
-		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
-		-DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
-		-DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
-		-DBUILD_SYSTEM="CMake"
-	)
-
-	# --------------------------------------------------------------------------
-	# write header for values that change each build
-	# note, generaed file is in build dir's source/creator
-	#       except when used as an include path.
-
-	# include the output directory, where the buildinfo.h file is generated
-	include_directories(${CMAKE_BINARY_DIR}/source/creator)
-
-	# a custom target that is always built
-	add_custom_target(buildinfo ALL
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h)
-
-	# creates svnheader.h using cmake script
-	add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		COMMAND ${CMAKE_COMMAND}
-		-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-		-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
-
-	# buildinfo.h is a generated file
-	set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		PROPERTIES GENERATED TRUE
-		HEADER_FILE_ONLY TRUE)
-
-	# add deps below, after adding blender
-	# -------------- done with header values.
-
-	list(APPEND SRC
-		buildinfo.c
-	)
-endif()
-
-# message(STATUS "Configuring blender")
-if(WITH_PYTHON_MODULE)
-	add_definitions(-DWITH_PYTHON_MODULE)
-
-	# creates ./bin/bpy.so which can be imported as a python module.
-	#
-	# note that 'SHARED' works on Linux and Windows,
-	# but not OSX which _must_ be 'MODULE'
-	add_library(blender MODULE ${SRC})
-	set_target_properties(
-		blender
-		PROPERTIES
-			PREFIX ""
-			OUTPUT_NAME bpy
-			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
-	)
-
-	if(APPLE)
-		set_target_properties(
-			blender
-			PROPERTIES
-				LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
-				LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
-		)
-	endif()
-
-	if(WIN32)
-		# python modules use this
-		set_target_properties(
-			blender
-			PROPERTIES
-			SUFFIX ".pyd"
-		)
-	endif()
-
-else()
-	add_executable(blender ${EXETYPE} ${SRC})
-endif()
-
-if(WITH_BUILDINFO)
-	# explicitly say that the executable depends on the buildinfo
-	add_dependencies(blender buildinfo)
-endif()
-
-# Post build steps for bundling/packaging.
-
-
-if(MSVC_IDE)
-	# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-elseif(APPLE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-else()
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
-endif()
-
-set(BLENDER_TEXT_FILES
-	${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/copyright.txt
-	${CMAKE_SOURCE_DIR}/release/text/readme.html
-)
-
-
-# -----------------------------------------------------------------------------
-# Platform Specific Var: TARGETDIR_VER
-
-if(UNIX AND NOT APPLE)
-	if(WITH_INSTALL_PORTABLE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		if(WITH_PYTHON_MODULE)
-			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
-		else()
-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-		endif()
-	endif()
-
-elseif(WIN32)
-	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-
-elseif(APPLE)
-	if(WITH_PYTHON_MODULE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
-	endif()
-
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Generic, All Platforms)
-
-
-# important to make a clean  install each time, else old scripts get loaded.
-install(
-	CODE
-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
-)
-
-if(WITH_PYTHON)
-	# install(CODE "message(\"copying blender scripts...\")")
-	
-	# exclude addons_contrib if release
-	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
-		set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
-	else()
-		set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
-	endif()
-
-	install(
-		DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts/
-		PATTERN ".svn" EXCLUDE
-		PATTERN "__pycache__" EXCLUDE
-		PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
-	)
-	
-	unset(ADDON_EXCLUDE_CONDITIONAL)
-endif()
-
-# localization
-if(WITH_INTERNATIONAL)
-	install(
-		DIRECTORY
-			${CMAKE_SOURCE_DIR}/release/datafiles/locale
-			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
-		DESTINATION ${TARGETDIR_VER}/datafiles
-		PATTERN ".svn" EXCLUDE
-	)
-endif()
-
-# helpful tip when using make
-if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}'
-	)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Platform Specific)
-
-if(UNIX AND NOT APPLE)
-
-	# there are a few differences between portable and system install
-	if(WITH_INSTALL_PORTABLE)
-		install(
-			FILES
-				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-				${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			PROGRAMS
-			${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${TARGETDIR}
-		)
-
-	else()
-		# main blender binary
-		if(WITH_PYTHON_MODULE)
-			install(
-				TARGETS blender
-				LIBRARY
-				DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
-			)
-		else()
-			install(
-				PROGRAMS ${TARGETDIR}/blender
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-
-		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			install(
-				PROGRAMS ${TARGETDIR}/blenderplayer
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-		# misc files
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-		)
-		install(
-			DIRECTORY
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.svg" EXCLUDE
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
-		)
-		install(
-			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-		)
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
-		)
-	endif()
-
-		# plugins in blender 2.6 don't work at the moment.
-		#
-		# install(
-		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-		# 	DESTINATION ${TARGETDIR_VER}
-		# 	PATTERN ".svn" EXCLUDE
-		# )
-
-	if(WITH_PYTHON)
-		if(WITH_PYTHON_INSTALL)
-			# on some platforms (like openSUSE) Python is linked
-			# to be used from lib64 folder.
-			# determine this from Python's libraries path
-			if(${PYTHON_LIBPATH} MATCHES "lib64$")
-				set(_target_LIB "lib64")
-			else()
-				set(_target_LIB "lib")
-			endif()
-
-			# Copy the systems python into the install directory
-			# Scons copy in tools/Blender.py
-			# install(CODE "message(\"copying a subset of the systems python...\")")
-			install(
-				DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
-				DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
-				PATTERN ".svn" EXCLUDE
-				PATTERN "__pycache__" EXCLUDE               # * any cache *
-				PATTERN "distutils" EXCLUDE                 # ./distutils
-				PATTERN "lib2to3" EXCLUDE                   # ./lib2to3
-				PATTERN "config" EXCLUDE                    # ./config
-				PATTERN "config-*" EXCLUDE                  # ./config-*
-				PATTERN "site-packages/*" EXCLUDE           # ./site-packages/*
-				PATTERN "tkinter" EXCLUDE                   # ./tkinter
-				PATTERN "lib-dynload/_tkinter.*" EXCLUDE    # ./lib-dynload/_tkinter.co
-				PATTERN "idlelib" EXCLUDE                   # ./idlelib
-				PATTERN "test" EXCLUDE                      # ./test
-				PATTERN "turtledemo" EXCLUDE                # ./turtledemo
-				PATTERN "turtle.py" EXCLUDE					# ./turtle.py
-			)
-
-			# # doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-			unset(_target_LIB)
-		endif()
-	endif()
-elseif(WIN32)
-
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
-		install(
-			FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/iconv/lib/iconv.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	# plugins in blender 2.6 don't work at the moment.
-	#
-	# install(
-	# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-	# 	DESTINATION ${TARGETDIR_VER}
-	# 	PATTERN ".svn" EXCLUDE
-	# )
-
-	if(WITH_PYTHON)
-		set_lib_path(PYLIB "python/lib")
-		install(
-			FILES ${PYLIB}/python32.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-		)
-
-		install(
-			FILES ${PYLIB}/python32_d.dll
-			DESTINATION ${TARGETDIR}
-			CONFIGURATIONS Debug
-		)
-
-		if(WITH_PYTHON_INSTALL)
-			# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
-
-			# create the directory in multiple steps, so it actually gets created when it doesn't exist yet
-			install(
-				CODE
-				"
-				message(\"creating ${TARGETDIR_VER}/python/lib\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\")
-				file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\")
-				message(\"done creating dir\")
-				"
-			)
-
-			install(
-				CODE
-				"
-				if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\")
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
-				else()
-					execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
-						\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
-				endif()
-				"
-			)
-
-			# doesnt work, todo
-			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
-		endif()
-	endif()
-
-	if(CMAKE_CL_64)
-		# gettext and png are statically linked on win64
-		install(
-			FILES ${LIBDIR}/zlib/lib/zlib.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#not needed since we link statically, maybe also unneeded for MinGW?
-		if(NOT WITH_MINGW64)
-			install(
-				FILES
-					${LIBDIR}/zlib/lib/zlib.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(MSVC)
-		install(
-			FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
-			DESTINATION ${TARGETDIR}
-		)
-	else()
-		#MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
-		if(NOT WITH_MINGW64)
-			install(
-				FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(WITH_CODEC_FFMPEG)
-		install(
-			FILES
-				${LIBDIR}/ffmpeg/lib/avcodec-53.dll
-				${LIBDIR}/ffmpeg/lib/avformat-53.dll
-				${LIBDIR}/ffmpeg/lib/avdevice-53.dll
-				${LIBDIR}/ffmpeg/lib/avutil-51.dll
-				${LIBDIR}/ffmpeg/lib/swscale-2.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-	endif()
-
-	if(WITH_CODEC_SNDFILE)
-		install(
-			FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_OPENAL)
-		install(
-			FILES
-				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
-	if(WITH_SDL)
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/sdl/lib/SDL.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-	if(NOT CMAKE_CL_64)
-		install(
-			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-		
-	install( # x86 builds can run on x64 Windows, so this is required at all times
-		FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
-		DESTINATION ${TARGETDIR}
-	)	
-
-	if(WITH_OPENIMAGEIO)
-		if(NOT MINGW)
-			set_lib_path(OIIOBIN "openimageio/bin")
-			install(
-				FILES
-					${OIIOBIN}/OpenImageIO.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
-elseif(APPLE)
-
-	# handy install macro to exclude files, we use \$ escape for the "to"
-	# argument when calling so ${BUILD_TYPE} does not get expanded
-	macro(install_dir from to)
-		install(
-			DIRECTORY ${from}
-			DESTINATION ${to}
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.pyc" EXCLUDE
-			PATTERN "*.pyo" EXCLUDE
-			PATTERN "*.orig" EXCLUDE
-			PATTERN "*.rej" EXCLUDE
-			PATTERN "__pycache__" EXCLUDE
-			PATTERN "__MACOSX" EXCLUDE
-			PATTERN ".DS_Store" EXCLUDE
-		)
-	endmacro()
-
-	set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-
-	# setup Info.plist
-	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-	set_target_properties(blender PROPERTIES
-		MACOSX_BUNDLE_INFO_PLIST ${OSX_APP_SOURCEDIR}/Contents/Info.plist
-		MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
-		MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
-
-
-	# install release and app files
-	install(
-		FILES ${BLENDER_TEXT_FILES}
-		DESTINATION ${TARGETDIR}
-	)
-
-	install(
-		FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
-		DESTINATION ${TARGETDIR}/blender.app/Contents
-	)
-
-	install_dir(
-		${OSX_APP_SOURCEDIR}/Contents/Resources
-		\${TARGETDIR}/blender.app/Contents/
-	)
-
-	# python
-	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
-		# the python zip is first extract as part of the build process,
-		# and then later installed as part of make install. this is much
-		# quicker, and means we can easily exclude files on copy
-		# Not needed for PYTHON_MODULE or WEB_PLUGIN due uses  Pyhon framework
-		add_custom_target(
-			extractpyzip
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
-
-		set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-
-		add_custom_command(
-			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-			COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-			COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-			DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-		add_dependencies(blender extractpyzip)
-
-		# copy extracted python files
-		install_dir(
-			${CMAKE_CURRENT_BINARY_DIR}/python
-			\${TARGETDIR_VER}
-		)
-
-	endif()
-
-	# install blenderplayer bundle - copy of blender.app above. re-using macros et al
-	# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
-	if(WITH_GAMEENGINE AND WITH_PLAYER)
-		set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
-		set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
-		set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})
-
-
-		# important to make a clean  install each time else old scripts get loaded.
-		install(
-			CODE
-			"file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
-		)
-
-		install(
-			FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
-			DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
-		)
-
-		install_dir(
-			${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
-			\${TARGETDIR}/blenderplayer.app/Contents/
-		)
-
-		# python
-		if(WITH_PYTHON)
-			add_custom_command(
-				OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
-				COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
-				COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
-				DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-			# copy extracted python files
-			install_dir(
-				${CMAKE_CURRENT_BINARY_DIR}/python
-				\${PLAYER_TARGETDIR_VER}
-			)
-		endif()
-
-	endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# Generic Install, for all targets
-
-
-
-# install more files specified elsewhere
-delayed_do_install(${TARGETDIR_VER})
-
-unset(BLENDER_TEXT_FILES)
-
-
-# -----------------------------------------------------------------------------
-# Setup link libs
-
-add_dependencies(blender makesdna)
-
-get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
-
-set(BLENDER_LINK_LIBS
-	${BLENDER_LINK_LIBS}
-	bf_windowmanager
-	bf_render
-)
-
-if(WITH_MOD_FLUID)
-	list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-endif()
-
-if(WITH_CYCLES)
-	list(APPEND BLENDER_LINK_LIBS
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd)
-endif()
-
-#if(UNIX)
-	# Sort libraries
-	set(BLENDER_SORTED_LIBS
-		bf_windowmanager
-
-		bf_editor_space_api
-		bf_editor_space_action
-		bf_editor_space_buttons
-		bf_editor_space_console
-		bf_editor_space_file
-		bf_editor_space_graph
-		bf_editor_space_image
-		bf_editor_space_info
-		bf_editor_space_logic
-		bf_editor_space_nla
-		bf_editor_space_node
-		bf_editor_space_outliner
-		bf_editor_space_script
-		bf_editor_space_sequencer
-		bf_editor_space_time
-		bf_editor_space_userpref
-		bf_editor_space_view3d
-		bf_editor_space_clip
-
-		bf_editor_text
-		bf_editor_transform
-		bf_editor_util
-		bf_editor_uvedit
-		bf_editor_curve
-		bf_editor_armature
-		bf_editor_gpencil
-		bf_editor_interface
-		bf_editor_mesh
-		bf_editor_metaball
-		bf_editor_object
-		bf_editor_physics
-		bf_editor_render
-		bf_editor_screen
-		bf_editor_sculpt_paint
-		bf_editor_sound
-		bf_editor_animation
-		bf_editor_datafiles
-
-		bf_render
-		bf_intern_opennl
-		bf_python
-		bf_python_ext
-		bf_python_mathutils
-		bf_python_bmesh
-		bf_ikplugin
-		bf_modifiers
-		bf_bmesh
-		bf_blenkernel
-		bf_nodes
-		bf_gpu
-		bf_blenloader
-		bf_imbuf
-		bf_blenlib
-		bf_intern_ghost
-		bf_intern_string
-		bf_blenpluginapi
-		bf_avi
-		bf_imbuf_cineon
-		bf_imbuf_openexr
-		bf_imbuf_dds
-		bf_collada
-		bf_intern_bsp
-		bf_intern_bop
-		bf_intern_decimate
-		bf_intern_elbeem
-		bf_intern_ik
-		bf_intern_memutil
-		bf_intern_guardedalloc
-		bf_intern_ctr
-		bf_intern_utfconv
-		ge_blen_routines
-		ge_converter
-		ge_phys_dummy
-		ge_phys_bullet
-		bf_intern_smoke
-		extern_minilzo
-		extern_lzma
-		extern_colamd
-		ge_logic_ketsji
-		extern_recastnavigation
-		ge_phys_common
-		ge_logic
-		ge_rasterizer
-		ge_oglrasterizer
-		ge_logic_expressions
-		ge_scenegraph
-		ge_logic_network
-		ge_logic_ngnetwork
-		extern_bullet
-		ge_logic_loopbacknetwork
-		bf_intern_moto
-		extern_openjpeg
-		extern_redcode
-		ge_videotex
-		bf_rna
-		bf_dna
-		bf_blenfont
-		bf_intern_audaspace
-		bf_intern_mikktspace
-		bf_intern_dualcon
-		bf_intern_cycles
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd
-	)
-
-	if(WITH_LIBMV)
-		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
-	endif()
-
-	if(WITH_MOD_CLOTH_ELTOPO)
-		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-	endif()
-
-	if(WITH_BUILTIN_GLEW)
-		list(APPEND BLENDER_SORTED_LIBS extern_glew)
-	endif()
-
-	if(WITH_BINRELOC)
-		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
-	endif()
-
-	if(WITH_CXX_GUARDEDALLOC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	endif()
-
-	if(WITH_IK_ITASC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
-	endif()
-
-	if(WITH_CODEC_QUICKTIME)
-		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	endif()
-
-	if(WITH_CARVE)
-		list(APPEND BLENDER_SORTED_LIBS extern_carve)
-	endif()
-
-	if(WITH_GHOST_XDND)
-		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
-	endif()
-
-	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		set(REMLIB ${SORTLIB})
-		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				set(REMLIB "")
-			endif()
-		endforeach()
-		if(REMLIB)
-			# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-			list(APPEND REM_MSG ${REMLIB})
-			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		endif()
-	endforeach()
-	if(REM_MSG)
-		list(SORT REM_MSG)
-		message(STATUS "Blender Skipping: (${REM_MSG})")
-	endif()
-	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-
-	unset(SEARCHLIB)
-	unset(SORTLIB)
-	unset(REMLIB)
-	unset(REM_MSG)
-
-#else()
-#	target_link_libraries(blender ${BLENDER_LINK_LIBS})
-#endif()
-
-setup_liblinks(blender)
 
=== removed directory '.pc/0005-locales_directory_install.patch'
=== removed directory '.pc/0005-locales_directory_install.patch/source'
=== removed directory '.pc/0005-locales_directory_install.patch/source/blender'
=== removed directory '.pc/0005-locales_directory_install.patch/source/blender/blenfont'
=== removed directory '.pc/0005-locales_directory_install.patch/source/blender/blenfont/intern'
=== removed file '.pc/0005-locales_directory_install.patch/source/blender/blenfont/intern/blf_lang.c'
--- .pc/0005-locales_directory_install.patch/source/blender/blenfont/intern/blf_lang.c	2012-04-28 12:11:12 +0000
+++ .pc/0005-locales_directory_install.patch/source/blender/blenfont/intern/blf_lang.c	1970-01-01 00:00:00 +0000
@@ -1,303 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- * 
- * Contributor(s): Blender Foundation.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenfont/intern/blf_lang.c
- *  \ingroup blf
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "BKE_global.h"
-
-#include "BLF_api.h"
-
-#include "BLF_translation.h" /* own include */
-
-#ifdef WITH_INTERNATIONAL
-
-#include <locale.h>
-
-#if defined (_WIN32)
-#include <windows.h>
-#endif
-
-#include "libintl.h"
-
-#include "DNA_userdef_types.h"
-
-#include "DNA_listBase.h"
-#include "DNA_vec_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_linklist.h" /* linknode */
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
-
-#define SYSTEM_ENCODING_DEFAULT "UTF-8"
-#define FONT_SIZE_DEFAULT 12
-
-/* locale options. */
-static char global_messagepath[1024];
-static char global_language[32];
-static char global_encoding_name[32];
-
-/* map from the rna_userdef.c:rna_def_userdef_system(BlenderRNA *brna):language_items */
-static const char *locales[] = {
-	"", "",
-	"english", "en_US",
-	"japanese", "ja_JP",
-	"dutch", "nl_NL",
-	"italian", "it_IT",
-	"german", "de_DE",
-	"finnish", "fi_FI",
-	"swedish", "sv_SE",
-	"french", "fr_FR",
-	"spanish", "es",
-	"catalan", "ca_AD",
-	"czech", "cs_CZ",
-	"ptb", "pt",
-#if defined (_WIN32) && !defined(FREE_WINDOWS)
-	"Chinese (Simplified)_China.1252", "zh_CN",
-	"Chinese (Traditional)_China.1252", "zh_TW",
-#else
-	"chs", "zh_CN",
-	"cht", "zh_TW",
-#endif
-	"russian", "ru_RU",
-	"croatian", "hr_HR",
-	"serbian", "sr_RS",
-	"ukrainian", "uk_UA",
-	"polish", "pl_PL",
-	"romanian", "ro_RO",
-	"arabic", "ar_EG",
-	"bulgarian", "bg_BG",
-	"greek", "el_GR",
-	"korean", "ko_KR",
-	"nepali", "ne_NP",
-	"persian", "fa_IR",
-	"indonesian", "id_ID",
-	"serbian (latin)", "sr_RS@latin",
-	"kyrgyz", "ky_KG",
-	"turkish", "tr_TR",
-};
-
-void BLF_lang_init(void)
-{
-	char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
-	
-	BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name));
-	
-	if (messagepath) {
-		BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath));
-	}
-	else {
-		printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
-		global_messagepath[0] = '\0';
-	}
-	
-}
-
-/* get LANG/LANGUAGE environment variable */
-static void get_language_variable(const char *varname, char *var, int maxlen)
-{
-	char *env = getenv(varname);
-
-	if (env) {
-		char *s;
-
-		/* store defaul locale */
-		BLI_strncpy(var, env, maxlen);
-
-		/* use first language as default */
-		s = strchr(var, ':');
-		if (s)
-			s[0] = 0;
-	}
-}
-
-/* get language to be used based on locale(which might be empty when using default language) and
- * LANG environment variable
- */
-static void get_language(const char *locale, const char *lang, char *language, int maxlen)
-{
-	if (locale[0]) {
-		BLI_strncpy(language, locale, maxlen);
-	}
-	else {
-		char *s;
-
-		BLI_strncpy(language, lang, maxlen);
-
-		s = strchr(language, '.');
-		if (s)
-			s[0] = 0;
-	}
-}
-
-/* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */
-void BLF_lang_set(const char *str)
-{
-	char *locreturn;
-	const char *short_locale;
-	int ok = 1;
-	const char *long_locale = locales[2 * U.language];
-
-	if ((U.transopts&USER_DOTRANSLATE) == 0)
-		return;
-
-	if (str)
-		short_locale = str;
-	else
-		short_locale = locales[ 2 * U.language + 1];
-
-#if defined (_WIN32) && !defined(FREE_WINDOWS)
-	if (short_locale) {
-		char *envStr;
-
-		if (U.language == 0)/* use system setting */
-			envStr = BLI_sprintfN( "LANG=%s", getenv("LANG") );
-		else
-			envStr = BLI_sprintfN( "LANG=%s", short_locale );
-
-		gettext_putenv(envStr);
-		MEM_freeN(envStr);
-	}
-
-	locreturn = setlocale(LC_ALL, long_locale);
-
-	if (locreturn == NULL) {
-		if (G.debug & G_DEBUG)
-			printf("Could not change locale to %s\n", long_locale);
-
-		ok = 0;
-	}
-#else
-	{
-		static char default_lang[64] ="\0";
-		static char default_language[64] ="\0";
-
-		if (default_lang[0] == 0)
-			get_language_variable("LANG", default_lang, sizeof(default_lang));
-
-		if (default_language[0] == 0)
-			get_language_variable("LANGUAGE", default_language, sizeof(default_language));
-
-		if (short_locale[0]) {
-			if (G.debug & G_DEBUG)
-				printf("Setting LANG= and LANGUAGE to %s\n", short_locale);
-
-			BLI_setenv("LANG", short_locale);
-			BLI_setenv("LANGUAGE", short_locale);
-		}
-		else {
-			if (G.debug & G_DEBUG)
-				printf("Setting LANG=%s and LANGUAGE=%s\n", default_lang, default_language);
-
-			BLI_setenv("LANG", default_lang);
-			BLI_setenv("LANGUAGE", default_language);
-		}
-
-		locreturn = setlocale(LC_ALL, short_locale);
-
-		if (locreturn == NULL) {
-			char *short_locale_utf8 = NULL;
-
-			if (short_locale[0]) {
-				short_locale_utf8 = BLI_sprintfN("%s.UTF-8", short_locale);
-				locreturn = setlocale(LC_ALL, short_locale_utf8);
-			}
-
-			if (locreturn == NULL) {
-				char language[65];
-
-				get_language(long_locale, default_lang, language, sizeof(language));
-
-				if (G.debug & G_DEBUG) {
-					if (short_locale[0])
-						printf("Could not change locale to %s nor %s\n", short_locale, short_locale_utf8);
-					else
-						printf("Could not reset locale\n");
-
-					printf("Fallback to LANG=%s and LANGUAGE=%s\n", default_lang, language);
-				}
-
-				/* fallback to default settings */
-				BLI_setenv("LANG", default_lang);
-				BLI_setenv("LANGUAGE", language);
-
-				locreturn = setlocale(LC_ALL, "");
-
-				ok = 0;
-			}
-
-			if (short_locale_utf8)
-				MEM_freeN(short_locale_utf8);
-		}
-	}
-#endif
-
-	if (ok) {
-		/*printf("Change locale to %s\n", locreturn ); */
-		BLI_strncpy(global_language, locreturn, sizeof(global_language));
-	}
-
-	setlocale(LC_NUMERIC, "C");
-
-	textdomain(TEXT_DOMAIN_NAME);
-	bindtextdomain(TEXT_DOMAIN_NAME, global_messagepath);
-	bind_textdomain_codeset(TEXT_DOMAIN_NAME, global_encoding_name);
-}
-
-void BLF_lang_encoding(const char *str)
-{
-	BLI_strncpy(global_encoding_name, str, sizeof(global_encoding_name));
-	/* bind_textdomain_codeset(TEXT_DOMAIN_NAME, encoding_name); */
-}
-
-#else /* ! WITH_INTERNATIONAL */
-
-void BLF_lang_init(void)
-{
-	return;
-}
-
-void BLF_lang_encoding(const char *str)
-{
-	(void)str;
-	return;
-}
-
-void BLF_lang_set(const char *str)
-{
-	(void)str;
-	return;
-}
-
-#endif /* WITH_INTERNATIONAL */
 
=== removed directory '.pc/0005-locales_directory_install.patch/source/blender/blenlib'
=== removed file '.pc/0005-locales_directory_install.patch/source/blender/blenlib/BLI_path_util.h'
--- .pc/0005-locales_directory_install.patch/source/blender/blenlib/BLI_path_util.h	2012-04-28 12:11:12 +0000
+++ .pc/0005-locales_directory_install.patch/source/blender/blenlib/BLI_path_util.h	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef __BLI_PATH_UTIL_H__
-#define __BLI_PATH_UTIL_H__
-
-/** \file BLI_path_util.h
- *  \ingroup bli
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ListBase;
-struct direntry;
-
-const char *BLI_getDefaultDocumentFolder(void);
-
-char *BLI_get_folder(int folder_id, const char *subfolder);
-char *BLI_get_folder_create(int folder_id, const char *subfolder);
-char *BLI_get_user_folder_notest(int folder_id, const char *subfolder);
-char *BLI_get_folder_version(const int id, const int ver, const int do_check);
-
-/* folder_id */
-
-/* general, will find based on user/local/system priority */
-#define BLENDER_DATAFILES			2
-
-/* user-specific */
-#define BLENDER_USER_CONFIG			31
-#define BLENDER_USER_DATAFILES		32
-#define BLENDER_USER_SCRIPTS		33
-#define BLENDER_USER_PLUGINS		34
-#define BLENDER_USER_AUTOSAVE		35
-
-/* system */
-#define BLENDER_SYSTEM_DATAFILES	52
-#define BLENDER_SYSTEM_SCRIPTS		53
-#define BLENDER_SYSTEM_PLUGINS		54
-#define BLENDER_SYSTEM_PYTHON		54
-
-/* for BLI_get_folder_version only */
-#define BLENDER_RESOURCE_PATH_USER		0
-#define BLENDER_RESOURCE_PATH_LOCAL		1
-#define BLENDER_RESOURCE_PATH_SYSTEM	2
-
-#define BLENDER_STARTUP_FILE	"startup.blend"
-#define BLENDER_BOOKMARK_FILE	"bookmarks.txt"
-#define BLENDER_HISTORY_FILE	"recent-files.txt"
-
-#ifdef WIN32
-#define SEP '\\'
-#define ALTSEP '/'
-#else
-#define SEP '/'
-#define ALTSEP '\\'
-#endif
-
-void BLI_setenv(const char *env, const char *val);
-void BLI_setenv_if_new(const char *env, const char* val);
-
-void BLI_make_file_string(const char *relabase, char *string,  const char *dir, const char *file);
-void BLI_make_exist(char *dir);
-void BLI_make_existing_file(const char *name);
-void BLI_split_dirfile(const char *string, char *dir, char *file, const size_t dirlen, const size_t filelen);
-void BLI_split_dir_part(const char *string, char *dir, const size_t dirlen);
-void BLI_split_file_part(const char *string, char *file, const size_t filelen);
-void BLI_join_dirfile(char *string, const size_t maxlen, const char *dir, const char *file);
-char *BLI_path_basename(char *path);
-int BKE_rebase_path(char *abs, size_t abs_len, char *rel, size_t rel_len, const char *base_dir, const char *src_dir, const char *dest_dir);
-char *BLI_last_slash(const char *string);
-int	  BLI_add_slash(char *string);
-void  BLI_del_slash(char *string);
-char *BLI_first_slash(char *string);
-
-void BLI_getlastdir(const char* dir, char *last, const size_t maxlen);
-int BLI_testextensie(const char *str, const char *ext);
-int BLI_testextensie_array(const char *str, const char **ext_array);
-int BLI_testextensie_glob(const char *str, const char *ext_fnmatch);
-int BLI_replace_extension(char *path, size_t maxlen, const char *ext);
-int BLI_ensure_extension(char *path, size_t maxlen, const char *ext);
-void BLI_uniquename(struct ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short len);
-int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len);
-void BLI_newname(char * name, int add);
-int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen);
-void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic);
-int BLI_split_name_num(char *left, int *nr, const char *name, const char delim);
-void BLI_splitdirstring(char *di,char *fi);
-
-/* make sure path separators conform to system one */
-void BLI_clean(char *path);
-
-/**
- * dir can be any input, like from buttons, and this function
- * converts it to a regular full path.
- * Also removes garbage from directory paths, like /../ or double slashes etc 
- */
-void BLI_cleanup_file(const char *relabase, char *dir); /* removes trailing slash */
-void BLI_cleanup_dir(const char *relabase, char *dir); /* same as above but adds a trailing slash */
-void BLI_cleanup_path(const char *relabase, char *dir); /* doesn't touch trailing slash */
-
-/* go back one directory */
-int BLI_parent_dir(char *path);
-
-/* return whether directory is root and thus has no parent dir */
-int BLI_has_parent(char *path);
-
-/**
- * Blender's path code replacement function.
- * Bases \a path strings leading with "//" by the
- * directory \a basepath, and replaces instances of
- * '#' with the \a framenum. Results are written
- * back into \a path.
- * 
- * \a path The path to convert
- * \a basepath The directory to base relative paths with.
- * \a framenum The framenumber to replace the frame code with.
- * \retval Returns true if the path was relative (started with "//").
- */
-int BLI_path_abs(char *path, const char *basepath);
-int BLI_path_frame(char *path, int frame, int digits);
-int BLI_path_frame_range(char *path, int sta, int end, int digits);
-int BLI_path_cwd(char *path);
-void BLI_path_rel(char *file, const char *relfile);
-
-#ifdef WIN32
-#  define BLI_path_cmp BLI_strcasecmp
-#  define BLI_path_ncmp BLI_strncasecmp
-#else
-#  define BLI_path_cmp strcmp
-#  define BLI_path_ncmp strncmp
-#endif
-
-/**
- * Change every \a from in \a string into \a to. The
- * result will be in \a string
- *
- * \a string The string to work on
- * \a from The character to replace
- * \a to The character to replace with
- */
-void BLI_char_switch(char *string, char from, char to);
-
-	/* Initialize path to program executable */
-void BLI_init_program_path(const char *argv0);
-	/* Initialize path to temporary directory.
-	 * NOTE: On Window userdir will be set to the temporary directory! */
-void BLI_init_temporary_dir(char *userdir);
-
-	/* Path to executable */
-const char *BLI_program_path(void);
-	/* Path to directory of executable */
-const char *BLI_program_dir(void);
-	/* Path to temporary directory (with trailing slash) */
-const char *BLI_temporary_dir(void);
-	/* Path to the system temporary directory (with trailing slash) */
-void BLI_system_temporary_dir(char *dir);
-
-#ifdef WITH_ICONV
-void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
 
=== removed directory '.pc/0005-locales_directory_install.patch/source/blender/blenlib/intern'
=== removed file '.pc/0005-locales_directory_install.patch/source/blender/blenlib/intern/path_util.c'
--- .pc/0005-locales_directory_install.patch/source/blender/blenlib/intern/path_util.c	2012-04-28 12:11:12 +0000
+++ .pc/0005-locales_directory_install.patch/source/blender/blenlib/intern/path_util.c	1970-01-01 00:00:00 +0000
@@ -1,1981 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- * various string, file, list operations.
- */
-
-/** \file blender/blenlib/intern/path_util.c
- *  \ingroup bli
- */
-
-
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_listBase.h"
-
-#include "BLI_fileops.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_string_utf8.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_utildefines.h"
-#include "BKE_blender.h"	// BLENDER_VERSION
-
-#include "GHOST_Path-api.h"
-
-#if defined WIN32 && !defined _LIBC  || defined __sun
-#  include "BLI_fnmatch.h" /* use fnmatch included in blenlib */
-#else
-#  ifndef _GNU_SOURCE
-#    define _GNU_SOURCE
-#  endif
-#  include <fnmatch.h>
-#endif
-
-#ifdef WIN32
-#include "utf_winfunc.h"
-#  include <io.h>
-#  ifdef _WIN32_IE
-#    undef _WIN32_IE
-#  endif
-#  define _WIN32_IE 0x0501
-#  include <windows.h>
-#  include <shlobj.h>
-#  include "BLI_winstuff.h"
-#else /* non windows */
-#  ifdef WITH_BINRELOC
-#    include "binreloc.h"
-#  endif
-#endif /* WIN32 */
-
-/* standard paths */
-#ifdef WIN32
-#  define BLENDER_USER_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
-#  define BLENDER_SYSTEM_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
-#elif defined(__APPLE__)
-#  define BLENDER_USER_FORMAT			"%s/Blender/%s"
-#  define BLENDER_SYSTEM_FORMAT			"%s/Blender/%s"
-#else /* UNIX */
-#  ifndef WITH_XDG_USER_DIRS /* oldschool unix ~/.blender/ */
-#    define BLENDER_USER_FORMAT			"%s/.blender/%s"
-#  else /* new XDG ~/blender/.config/ */
-#    define BLENDER_USER_FORMAT			"%s/blender/%s"
-#  endif // WITH_XDG_USER_DIRS
-#  define BLENDER_SYSTEM_FORMAT			"%s/blender/%s"
-#endif
-
-/* local */
-#define UNIQUE_NAME_MAX 128
-
-static char bprogname[FILE_MAX];	/* path to program executable */
-static char bprogdir[FILE_MAX];		/* path in which executable is located */
-static char btempdir[FILE_MAX];		/* temporary directory */
-
-static int add_win32_extension(char *name);
-static char *blender_version_decimal(const int ver);
-
-/* implementation */
-
-int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *numlen)
-{
-	unsigned short len, len2, lenlslash = 0, nums = 0, nume = 0;
-	short i, found = 0;
-	char *lslash = BLI_last_slash(string);
-	len2 = len = strlen(string);
-	if (lslash)
-		lenlslash= (int)(lslash - string);
-
-	while (len > lenlslash && string[--len] != '.') {};
-	if (len == lenlslash && string[len] != '.') len = len2;
-
-	for (i = len - 1; i >= lenlslash; i--) {
-		if (isdigit(string[i])) {
-			if (found) {
-				nums = i;
-			}
-			else {
-				nume = i;
-				nums = i;
-				found = 1;
-			}
-		}
-		else {
-			if (found) break;
-		}
-	}
-	if (found) {
-		if (tail) strcpy(tail, &string[nume+1]);
-		if (head) {
-			strcpy(head,string);
-			head[nums]=0;
-		}
-		if (numlen) *numlen = nume-nums+1;
-		return ((int)atoi(&(string[nums])));
-	}
-	if (tail) strcpy(tail, string + len);
-	if (head) {
-		strncpy(head, string, len);
-		head[len] = '\0';
-	}
-	if (numlen) *numlen=0;
-	return 0;
-}
-
-
-void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic)
-{
-	char fmtstr[16]="";
-	if (pic < 0) pic= 0;
-	sprintf(fmtstr, "%%s%%.%dd%%s", numlen);
-	sprintf(string, fmtstr, head, pic, tail);
-}
-
-/* Foo.001 -> "Foo", 1
- * Returns the length of "Foo" */
-int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
-{
-	int a;
-
-	*nr= 0;
-	a= strlen(name);
-	memcpy(left, name, (a + 1) * sizeof(char));
-
-	if (a>1 && name[a-1]==delim) return a;
-	
-	while (a--) {
-		if ( name[a]==delim ) {
-			left[a]= 0;
-			*nr= atol(name+a+1);
-			/* casting down to an int, can overflow for large numbers */
-			if (*nr < 0)
-				*nr= 0;
-			return a;
-		}
-		if ( isdigit(name[a])==0 ) break;
-		
-		left[a]= 0;
-	}
-
-	for (a= 0; name[a]; a++)
-		left[a]= name[a];
-
-	return a;
-}
-
-void BLI_newname(char *name, int add)
-{
-	char head[UNIQUE_NAME_MAX], tail[UNIQUE_NAME_MAX];
-	int pic;
-	unsigned short digits;
-	
-	pic = BLI_stringdec(name, head, tail, &digits);
-	
-	/* are we going from 100 -> 99 or from 10 -> 9 */
-	if (add < 0 && digits < 4 && digits > 0) {
-		int i, exp;
-		exp = 1;
-		for (i = digits; i > 1; i--) exp *= 10;
-		if (pic >= exp && (pic + add) < exp) digits--;
-	}
-	
-	pic += add;
-	
-	if (digits==4 && pic<0) pic= 0;
-	BLI_stringenc(name, head, tail, digits, pic);
-}
-
-
-
-int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len)
-{
-	if (name[0] == '\0') {
-		BLI_strncpy(name, defname, name_len);
-	}
-
-	if (unique_check(arg, name)) {
-		char	numstr[16];
-		char	tempname[UNIQUE_NAME_MAX];
-		char	left[UNIQUE_NAME_MAX];
-		int		number;
-		int		len= BLI_split_name_num(left, &number, name, delim);
-		do {
-			int numlen= BLI_snprintf(numstr, sizeof(numstr), "%c%03d", delim, ++number);
-
-			/* highly unlikely the string only has enough room for the number
-			 * but support anyway */
-			if ((len == 0) || (numlen >= name_len)) {
-				/* number is know not to be utf-8 */
-				BLI_strncpy(tempname, numstr, name_len);
-			}
-			else {
-				char *tempname_buf;
-				tempname[0]= '\0';
-				tempname_buf = BLI_strncat_utf8(tempname, left, name_len - numlen);
-				memcpy(tempname_buf, numstr, numlen + 1);
-			}
-		} while (unique_check(arg, tempname));
-
-		BLI_strncpy(name, tempname, name_len);
-		
-		return 1;
-	}
-	
-	return 0;
-}
-
-/* little helper macro for BLI_uniquename */
-#ifndef GIVE_STRADDR
-	#define GIVE_STRADDR(data, offset) ( ((char *)data) + offset )
-#endif
-
-/* Generic function to set a unique name. It is only designed to be used in situations
- * where the name is part of the struct, and also that the name is at most UNIQUE_NAME_MAX chars long.
- * 
- * For places where this is used, see constraint.c for example...
- *
- * 	name_offs: should be calculated using offsetof(structname, membername) macro from stddef.h
- *	len: maximum length of string (to prevent overflows, etc.)
- *	defname: the name that should be used by default if none is specified already
- *	delim: the character which acts as a delimiter between parts of the name
- */
-static int uniquename_find_dupe(ListBase *list, void *vlink, const char *name, short name_offs)
-{
-	Link *link;
-
-	for (link = list->first; link; link= link->next) {
-		if (link != vlink) {
-			if (!strcmp(GIVE_STRADDR(link, name_offs), name)) {
-				return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int uniquename_unique_check(void *arg, const char *name)
-{
-	struct {ListBase *lb; void *vlink; short name_offs;} *data= arg;
-	return uniquename_find_dupe(data->lb, data->vlink, name, data->name_offs);
-}
-
-void BLI_uniquename(ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short name_len)
-{
-	struct {ListBase *lb; void *vlink; short name_offs;} data;
-	data.lb= list;
-	data.vlink= vlink;
-	data.name_offs= name_offs;
-
-	assert((name_len > 1) && (name_len <= UNIQUE_NAME_MAX));
-
-	/* See if we are given an empty string */
-	if (ELEM(NULL, vlink, defname))
-		return;
-
-	BLI_uniquename_cb(uniquename_unique_check, &data, defname, delim, GIVE_STRADDR(vlink, name_offs), name_len);
-}
-
-
-
-/* ******************** string encoding ***************** */
-
-/* This is quite an ugly function... its purpose is to
- * take the dir name, make it absolute, and clean it up, replacing
- * excess file entry stuff (like /tmp/../tmp/../)
- * note that dir isn't protected for max string names... 
- * 
- * If relbase is NULL then its ignored
- */
-
-void BLI_cleanup_path(const char *relabase, char *dir)
-{
-	ptrdiff_t a;
-	char *start, *eind;
-	if (relabase) {
-		BLI_path_abs(dir, relabase);
-	}
-	else {
-		if (dir[0]=='/' && dir[1]=='/') {
-			if (dir[2]== '\0') {
-				return; /* path is "//" - cant clean it */
-			}
-			dir = dir+2; /* skip the first // */
-		}
-	}
-	
-	/* Note
-	 *   memmove(start, eind, strlen(eind) + 1);
-	 * is the same as
-	 *   strcpy( start, eind ); 
-	 * except strcpy should not be used because there is overlap,
-	 * so use memmove's slightly more obscure syntax - Campbell
-	 */
-	
-#ifdef WIN32
-	
-	/* Note, this should really be moved to the file selector,
-	 * since this function is used in many areas */
-	if (strcmp(dir, ".")==0) {	/* happens for example in FILE_MAIN */
-		get_default_root(dir);
-		return;
-	}	
-
-	while ( (start = strstr(dir, "\\..\\")) ) {
-		eind = start + strlen("\\..\\") - 1;
-		a = start-dir-1;
-		while (a>0) {
-			if (dir[a] == '\\') break;
-			a--;
-		}
-		if (a<0) {
-			break;
-		}
-		else {
-			memmove(dir + a, eind, strlen(eind) + 1);
-		}
-	}
-
-	while ( (start = strstr(dir,"\\.\\")) ) {
-		eind = start + strlen("\\.\\") - 1;
-		memmove(start, eind, strlen(eind) + 1);
-	}
-
-	while ( (start = strstr(dir,"\\\\" )) ) {
-		eind = start + strlen("\\\\") - 1;
-		memmove(start, eind, strlen(eind) + 1);
-	}
-#else
-	if (dir[0]=='.') {	/* happens, for example in FILE_MAIN */
-		dir[0]= '/';
-		dir[1]= 0;
-		return;
-	}
-
-	/* support for odd paths: eg /../home/me --> /home/me
-	 * this is a valid path in blender but we cant handle this the usual way below
-	 * simply strip this prefix then evaluate the path as usual. pythons os.path.normpath() does this */
-	while ((strncmp(dir, "/../", 4)==0)) {
-		memmove(dir, dir + 4, strlen(dir + 4) + 1);
-	}
-
-	while ( (start = strstr(dir, "/../")) ) {
-		eind = start + (4 - 1) /* strlen("/../") - 1 */;
-		a = start-dir-1;
-		while (a>0) {
-			if (dir[a] == '/') break;
-			a--;
-		}
-		if (a<0) {
-			break;
-		}
-		else {
-			memmove(dir+a, eind, strlen(eind) + 1);
-		}
-	}
-
-	while ( (start = strstr(dir,"/./")) ) {
-		eind = start + (3 - 1) /* strlen("/./") - 1 */;
-		memmove(start, eind, strlen(eind) + 1);
-	}
-
-	while ( (start = strstr(dir,"//" )) ) {
-		eind = start + (2 - 1) /* strlen("//") - 1 */;
-		memmove(start, eind, strlen(eind) + 1);
-	}
-#endif
-}
-
-void BLI_cleanup_dir(const char *relabase, char *dir)
-{
-	BLI_cleanup_path(relabase, dir);
-	BLI_add_slash(dir);
-
-}
-
-void BLI_cleanup_file(const char *relabase, char *dir)
-{
-	BLI_cleanup_path(relabase, dir);
-	BLI_del_slash(dir);
-}
-
-void BLI_path_rel(char *file, const char *relfile)
-{
-	char * lslash;
-	char temp[FILE_MAX];
-	char res[FILE_MAX];
-	
-	/* if file is already relative, bail out */
-	if (file[0]=='/' && file[1]=='/') return;
-	
-	/* also bail out if relative path is not set */
-	if (relfile[0] == 0) return;
-
-#ifdef WIN32
-	if (BLI_strnlen(relfile, 3) > 2 && relfile[1] != ':') {
-		char* ptemp;
-		/* fix missing volume name in relative base,
-		 * can happen with old recent-files.txt files */
-		get_default_root(temp);
-		ptemp = &temp[2];
-		if (relfile[0] != '\\' && relfile[0] != '/') {
-			ptemp++;
-		}
-		BLI_strncpy(ptemp, relfile, FILE_MAX-3);
-	}
-	else {
-		BLI_strncpy(temp, relfile, FILE_MAX);
-	}
-
-	if (BLI_strnlen(file, 3) > 2) {
-		if ( temp[1] == ':' && file[1] == ':' && temp[0] != file[0] )
-			return;
-	}
-#else
-	BLI_strncpy(temp, relfile, FILE_MAX);
-#endif
-
-	BLI_char_switch(temp, '\\', '/');
-	BLI_char_switch(file, '\\', '/');
-	
-	/* remove /./ which confuse the following slash counting... */
-	BLI_cleanup_path(NULL, file);
-	BLI_cleanup_path(NULL, temp);
-	
-	/* the last slash in the file indicates where the path part ends */
-	lslash = BLI_last_slash(temp);
-
-	if (lslash) {
-		/* find the prefix of the filename that is equal for both filenames.
-		 * This is replaced by the two slashes at the beginning */
-		char *p= temp;
-		char *q= file;
-
-#ifdef WIN32
-		while (tolower(*p) == tolower(*q))
-#else
-		while (*p == *q)
-#endif
-		{
-			++p; ++q;
-			/* don't search beyond the end of the string
-			 * in the rare case they match */
-			if ((*p=='\0') || (*q=='\0')) {
-				break;
-			}
-		}
-
-		/* we might have passed the slash when the beginning of a dir matches 
-		 * so we rewind. Only check on the actual filename
-		 */
-		if (*q != '/') {
-			while ( (q >= file) && (*q != '/') ) { --q; --p; }
-		} 
-		else if (*p != '/') {
-			while ( (p >= temp) && (*p != '/') ) { --p; --q; }
-		}
-		
-		strcpy(res,	"//");
-
-		/* p now points to the slash that is at the beginning of the part
-		 * where the path is different from the relative path. 
-		 * We count the number of directories we need to go up in the
-		 * hierarchy to arrive at the common 'prefix' of the path
-		 */
-		while (p && p < lslash)	{
-			if (*p == '/') 
-				strcat(res,	"../");
-			++p;
-		}
-
-		strcat(res, q+1); /* don't copy the slash at the beginning */
-		
-#ifdef	WIN32
-		BLI_char_switch(res+2, '/', '\\');
-#endif
-		strcpy(file, res);
-	}
-}
-
-int BLI_has_parent(char *path)
-{
-	int len;
-	int slashes = 0;
-	BLI_clean(path);
-	len = BLI_add_slash(path) - 1;
-
-	while (len>=0) {
-		if ((path[len] == '\\') || (path[len] == '/'))
-			slashes++;
-		len--;
-	}
-	return slashes > 1;
-}
-
-int BLI_parent_dir(char *path)
-{
-	static char parent_dir[]= {'.', '.', SEP, '\0'}; /* "../" or "..\\" */
-	char tmp[FILE_MAX+4];
-	BLI_strncpy(tmp, path, sizeof(tmp)-4);
-	BLI_add_slash(tmp);
-	strcat(tmp, parent_dir);
-	BLI_cleanup_dir(NULL, tmp);
-
-	if (!BLI_testextensie(tmp, parent_dir)) {
-		BLI_strncpy(path, tmp, sizeof(tmp));	
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-static int stringframe_chars(char *path, int *char_start, int *char_end)
-{
-	int ch_sta, ch_end, i;
-	/* Insert current frame: file### -> file001 */
-	ch_sta = ch_end = 0;
-	for (i = 0; path[i] != '\0'; i++) {
-		if (path[i] == '\\' || path[i] == '/') {
-			ch_end = 0; /* this is a directory name, don't use any hashes we found */
-		}
-		else if (path[i] == '#') {
-			ch_sta = i;
-			ch_end = ch_sta+1;
-			while (path[ch_end] == '#') {
-				ch_end++;
-			}
-			i = ch_end-1; /* keep searching */
-			
-			/* don't break, there may be a slash after this that invalidates the previous #'s */
-		}
-	}
-
-	if (ch_end) {
-		*char_start= ch_sta;
-		*char_end= ch_end;
-		return 1;
-	}
-	else {
-		*char_start= -1;
-		*char_end= -1;
-		return 0;
-	}
-}
-
-static void ensure_digits(char *path, int digits)
-{
-	char *file= BLI_last_slash(path);
-
-	if (file==NULL)
-		file= path;
-
-	if (strrchr(file, '#') == NULL) {
-		int len= strlen(file);
-
-		while (digits--) {
-			file[len++]= '#';
-		}
-		file[len]= '\0';
-	}
-}
-
-int BLI_path_frame(char *path, int frame, int digits)
-{
-	int ch_sta, ch_end;
-
-	if (digits)
-		ensure_digits(path, digits);
-
-	if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
-		char tmp[FILE_MAX];
-		sprintf(tmp, "%.*s%.*d%s", ch_sta, path, ch_end-ch_sta, frame, path+ch_end);
-		strcpy(path, tmp);
-		return 1;
-	}
-	return 0;
-}
-
-int BLI_path_frame_range(char *path, int sta, int end, int digits)
-{
-	int ch_sta, ch_end;
-
-	if (digits)
-		ensure_digits(path, digits);
-
-	if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
-		char tmp[FILE_MAX];
-		BLI_snprintf(tmp, sizeof(tmp),
-		             "%.*s%.*d-%.*d%s",
-		             ch_sta, path, ch_end-ch_sta, sta, ch_end-ch_sta, end, path+ch_end);
-		BLI_strncpy(path, tmp, FILE_MAX);
-		return 1;
-	}
-	return 0;
-}
-
-int BLI_path_abs(char *path, const char *basepath)
-{
-	int wasrelative = (strncmp(path, "//", 2)==0);
-	char tmp[FILE_MAX];
-	char base[FILE_MAX];
-#ifdef WIN32
-	char vol[3] = {'\0', '\0', '\0'};
-
-	BLI_strncpy(vol, path, 3);
-	/* we are checking here if we have an absolute path that is not in the current
-	 * blend file as a lib main - we are basically checking for the case that a 
-	 * UNIX root '/' is passed.
-	 */
-	if (!wasrelative && (vol[1] != ':' && (vol[0] == '\0' || vol[0] == '/' || vol[0] == '\\'))) {
-		char *p = path;
-		get_default_root(tmp);
-		// get rid of the slashes at the beginning of the path
-		while (*p == '\\' || *p == '/') {
-			p++;
-		}
-		strcat(tmp, p);
-	}
-	else {
-		BLI_strncpy(tmp, path, FILE_MAX);
-	}
-#else
-	BLI_strncpy(tmp, path, sizeof(tmp));
-	
-	/* Check for loading a windows path on a posix system
-	 * in this case, there is no use in trying C:/ since it 
-	 * will never exist on a unix os.
-	 * 
-	 * Add a / prefix and lowercase the driveletter, remove the :
-	 * C:\foo.JPG -> /c/foo.JPG */
-	
-	if (isalpha(tmp[0]) && tmp[1] == ':' && (tmp[2]=='\\' || tmp[2]=='/') ) {
-		tmp[1] = tolower(tmp[0]); /* replace ':' with driveletter */
-		tmp[0] = '/'; 
-		/* '\' the slash will be converted later */
-	}
-	
-#endif
-
-	BLI_strncpy(base, basepath, sizeof(base));
-
-	/* file component is ignored, so don't bother with the trailing slash */
-	BLI_cleanup_path(NULL, base);
-	
-	/* push slashes into unix mode - strings entering this part are
-	 * potentially messed up: having both back- and forward slashes.
-	 * Here we push into one conform direction, and at the end we
-	 * push them into the system specific dir. This ensures uniformity
-	 * of paths and solving some problems (and prevent potential future
-	 * ones) -jesterKing. */
-	BLI_char_switch(tmp, '\\', '/');
-	BLI_char_switch(base, '\\', '/');	
-
-	/* Paths starting with // will get the blend file as their base,
-	 * this isn't standard in any os but is used in blender all over the place */
-	if (wasrelative) {
-		char *lslash= BLI_last_slash(base);
-		if (lslash) {
-			int baselen= (int) (lslash-base) + 1;
-			/* use path for temp storage here, we copy back over it right away */
-			BLI_strncpy(path, tmp+2, FILE_MAX);
-			
-			memcpy(tmp, base, baselen);
-			BLI_strncpy(tmp+baselen, path, sizeof(tmp)-baselen);
-			BLI_strncpy(path, tmp, FILE_MAX);
-		}
-		else {
-			BLI_strncpy(path, tmp+2, FILE_MAX);
-		}
-	}
-	else {
-		BLI_strncpy(path, tmp, FILE_MAX);
-	}
-
-	BLI_cleanup_path(NULL, path);
-
-#ifdef WIN32
-	/* skip first two chars, which in case of
-	 * absolute path will be drive:/blabla and
-	 * in case of relpath //blabla/. So relpath
-	 * // will be retained, rest will be nice and
-	 * shiny win32 backward slashes :) -jesterKing
-	 */
-	BLI_char_switch(path+2, '/', '\\');
-#endif
-	
-	return wasrelative;
-}
-
-
-/*
- * Should only be done with command line paths.
- * this is NOT something blenders internal paths support like the // prefix
- */
-int BLI_path_cwd(char *path)
-{
-	int wasrelative = 1;
-	int filelen = strlen(path);
-	
-#ifdef WIN32
-	if (filelen >= 3 && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
-		wasrelative = 0;
-#else
-	if (filelen >= 2 && path[0] == '/')
-		wasrelative = 0;
-#endif
-	
-	if (wasrelative==1) {
-		char cwd[FILE_MAX]= "";
-		BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isn't used */
-		
-		if (cwd[0] == '\0') {
-			printf( "Could not get the current working directory - $PWD for an unknown reason.");
-		}
-		else {
-			/* uses the blend path relative to cwd important for loading relative linked files.
-			 *
-			 * cwd should contain c:\ etc on win32 so the relbase can be NULL
-			 * relbase being NULL also prevents // being misunderstood as relative to the current
-			 * blend file which isn't a feature we want to use in this case since were dealing
-			 * with a path from the command line, rather than from inside Blender */
-
-			char origpath[FILE_MAX];
-			BLI_strncpy(origpath, path, FILE_MAX);
-			
-			BLI_make_file_string(NULL, path, cwd, origpath); 
-		}
-	}
-	
-	return wasrelative;
-}
-
-
-/* 'di's filename component is moved into 'fi', di is made a dir path */
-void BLI_splitdirstring(char *di, char *fi)
-{
-	char *lslash= BLI_last_slash(di);
-
-	if (lslash) {
-		BLI_strncpy(fi, lslash+1, FILE_MAXFILE);
-		*(lslash+1)=0;
-	}
-	else {
-		BLI_strncpy(fi, di, FILE_MAXFILE);
-		di[0]= 0;
-	}
-}
-
-void BLI_getlastdir(const char* dir, char *last, const size_t maxlen)
-{
-	const char *s = dir;
-	const char *lslash = NULL;
-	const char *prevslash = NULL;
-	while (*s) {
-		if ((*s == '\\') || (*s == '/')) {
-			prevslash = lslash;
-			lslash = s;
-		}
-		s++;
-	}
-	if (prevslash) {
-		BLI_strncpy(last, prevslash+1, maxlen);
-	}
-	else {
-		BLI_strncpy(last, dir, maxlen);
-	}
-}
-
-/* This is now only used to really get the user's default document folder */
-/* On Windows I chose the 'Users/<MyUserName>/Documents' since it's used
- * as default location to save documents */
-const char *BLI_getDefaultDocumentFolder(void)
-{
-#ifndef WIN32
-
-#ifdef WITH_XDG_USER_DIRS
-		const char *xdg_documents_dir= getenv("XDG_DOCUMENTS_DIR");
-		if (xdg_documents_dir) {
-			return xdg_documents_dir;
-		}
-#endif
-
-		return getenv("HOME");
-
-#else /* Windows */
-		static char documentfolder[MAXPATHLEN];
-		HRESULT hResult;
-
-		/* Check for %HOME% env var */
-		if (uput_getenv("HOME",documentfolder,MAXPATHLEN)) {
-			if (BLI_is_dir(documentfolder)) return documentfolder;
-		}
-				
-		/* add user profile support for WIN 2K / NT.
-		 * This is %APPDATA%, which translates to either
-		 * %USERPROFILE%\Application Data or since Vista
-		 * to %USERPROFILE%\AppData\Roaming
-		 */
-		hResult = SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, documentfolder);
-		
-		if (hResult == S_OK) {
-			if (BLI_is_dir(documentfolder)) return documentfolder;
-		}
-		
-		return NULL;
-#endif /* WIN32 */
-}
-
-/* NEW stuff, to be cleaned up when fully migrated */
-/* ************************************************************* */
-/* ************************************************************* */
-
-// #define PATH_DEBUG2
-
-static char *blender_version_decimal(const int ver)
-{
-	static char version_str[5];
-	sprintf(version_str, "%d.%02d", ver/100, ver%100);
-	return version_str;
-}
-
-static int test_path(char *targetpath, const char *path_base, const char *path_sep, const char *folder_name)
-{
-	char tmppath[FILE_MAX];
-	
-	if (path_sep)	BLI_join_dirfile(tmppath, sizeof(tmppath), path_base, path_sep);
-	else			BLI_strncpy(tmppath, path_base, sizeof(tmppath));
-
-	/* rare cases folder_name is omitted (when looking for ~/.blender/2.xx dir only) */
-	if (folder_name)
-		BLI_make_file_string("/", targetpath, tmppath, folder_name);
-	else
-		BLI_strncpy(targetpath, tmppath, sizeof(tmppath));
-
-	if (BLI_is_dir(targetpath)) {
-#ifdef PATH_DEBUG2
-		printf("\tpath found: %s\n", targetpath);
-#endif
-		return 1;
-	}
-	else {
-#ifdef PATH_DEBUG2
-		printf("\tpath missing: %s\n", targetpath);
-#endif
-		//targetpath[0] = '\0';
-		return 0;
-	}
-}
-
-static int test_env_path(char *path, const char *envvar)
-{
-	const char *env = envvar?getenv(envvar):NULL;
-	if (!env) return 0;
-	
-	if (BLI_is_dir(env)) {
-		BLI_strncpy(path, env, FILE_MAX);
-		return 1;
-	}
-	else {
-		path[0] = '\0';
-		return 0;
-	}
-}
-
-static int get_path_local(char *targetpath, const char *folder_name, const char *subfolder_name, const int ver)
-{
-	char relfolder[FILE_MAX];
-	
-#ifdef PATH_DEBUG2
-	printf("get_path_local...\n");
-#endif
-
-	if (folder_name) {
-		if (subfolder_name) {
-			BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
-		}
-		else {
-			BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
-		}
-	}
-	else {
-		relfolder[0]= '\0';
-	}
-
-	/* try EXECUTABLE_DIR/2.5x/folder_name - new default directory for local blender installed files */
-	if (test_path(targetpath, bprogdir, blender_version_decimal(ver), relfolder))
-		return 1;
-
-	return 0;
-}
-
-static int is_portable_install(void)
-{
-	/* detect portable install by the existance of config folder */
-	const int ver= BLENDER_VERSION;
-	char path[FILE_MAX];
-
-	return get_path_local(path, "config", NULL, ver);
-}
-
-static int get_path_user(char *targetpath, const char *folder_name, const char *subfolder_name, const char *envvar, const int ver)
-{
-	char user_path[FILE_MAX];
-	const char *user_base_path;
-
-	/* for portable install, user path is always local */
-	if (is_portable_install())
-		return get_path_local(targetpath, folder_name, subfolder_name, ver);
-	
-	user_path[0] = '\0';
-
-	if (test_env_path(user_path, envvar)) {
-		if (subfolder_name) {
-			return test_path(targetpath, user_path, NULL, subfolder_name);
-		}
-		else {
-			BLI_strncpy(targetpath, user_path, FILE_MAX);
-			return 1;
-		}
-	}
-
-	user_base_path = (const char *)GHOST_getUserDir();
-	if (user_base_path) {
-		BLI_snprintf(user_path, FILE_MAX, BLENDER_USER_FORMAT, user_base_path, blender_version_decimal(ver));
-	}
-
-	if (!user_path[0])
-		return 0;
-	
-#ifdef PATH_DEBUG2
-	printf("get_path_user: %s\n", user_path);
-#endif
-	
-	if (subfolder_name) {
-		/* try $HOME/folder_name/subfolder_name */
-		return test_path(targetpath, user_path, folder_name, subfolder_name);
-	}
-	else {
-		/* try $HOME/folder_name */
-		return test_path(targetpath, user_path, NULL, folder_name);
-	}
-}
-
-static int get_path_system(char *targetpath, const char *folder_name, const char *subfolder_name, const char *envvar, const int ver)
-{
-	char system_path[FILE_MAX];
-	const char *system_base_path;
-
-
-	/* first allow developer only overrides to the system path
-	 * these are only used when running blender from source */
-	char cwd[FILE_MAX];
-	char relfolder[FILE_MAX];
-
-	if (folder_name) {
-		if (subfolder_name) {
-			BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
-		}
-		else {
-			BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
-		}
-	}
-	else {
-		relfolder[0]= '\0';
-	}
-
-	/* try CWD/release/folder_name */
-	if (BLI_current_working_dir(cwd, sizeof(cwd))) {
-		if (test_path(targetpath, cwd, "release", relfolder)) {
-			return 1;
-		}
-	}
-
-	/* try EXECUTABLE_DIR/release/folder_name */
-	if (test_path(targetpath, bprogdir, "release", relfolder))
-		return 1;
-	/* end developer overrides */
-
-
-
-	system_path[0] = '\0';
-
-	if (test_env_path(system_path, envvar)) {
-		if (subfolder_name) {
-			return test_path(targetpath, system_path, NULL, subfolder_name);
-		}
-		else {
-			BLI_strncpy(targetpath, system_path, FILE_MAX);
-			return 1;
-		}
-	}
-
-	system_base_path = (const char *)GHOST_getSystemDir();
-	if (system_base_path) {
-		BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path, blender_version_decimal(ver));
-	}
-	
-	if (!system_path[0])
-		return 0;
-	
-#ifdef PATH_DEBUG2
-	printf("get_path_system: %s\n", system_path);
-#endif
-	
-	if (subfolder_name) {
-		/* try $BLENDERPATH/folder_name/subfolder_name */
-		return test_path(targetpath, system_path, folder_name, subfolder_name);
-	}
-	else {
-		/* try $BLENDERPATH/folder_name */
-		return test_path(targetpath, system_path, NULL, folder_name);
-	}
-}
-
-/* get a folder out of the 'folder_id' presets for paths */
-/* returns the path if found, NULL string if not */
-char *BLI_get_folder(int folder_id, const char *subfolder)
-{
-	const int ver= BLENDER_VERSION;
-	static char path[FILE_MAX] = "";
-	
-	switch (folder_id) {
-		case BLENDER_DATAFILES:		/* general case */
-			if (get_path_user(path, "datafiles", subfolder, "BLENDER_USER_DATAFILES", ver))	break;
-			if (get_path_local(path, "datafiles", subfolder, ver)) break;
-			if (get_path_system(path, "datafiles", subfolder, "BLENDER_SYSTEM_DATAFILES", ver)) break;
-			return NULL;
-			
-		case BLENDER_USER_DATAFILES:
-			if (get_path_user(path, "datafiles", subfolder, "BLENDER_USER_DATAFILES", ver))	break;
-			return NULL;
-			
-		case BLENDER_SYSTEM_DATAFILES:
-			if (get_path_local(path, "datafiles", subfolder, ver)) break;
-			if (get_path_system(path, "datafiles", subfolder, "BLENDER_SYSTEM_DATAFILES", ver))	break;
-			return NULL;
-			
-		case BLENDER_USER_AUTOSAVE:
-			if (get_path_user(path, "autosave", subfolder, "BLENDER_USER_DATAFILES", ver))	break;
-			return NULL;
-
-		case BLENDER_USER_CONFIG:
-			if (get_path_user(path, "config", subfolder, "BLENDER_USER_CONFIG", ver)) break;
-			return NULL;
-			
-		case BLENDER_USER_SCRIPTS:
-			if (get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver)) break;
-			return NULL;
-			
-		case BLENDER_SYSTEM_SCRIPTS:
-			if (get_path_local(path, "scripts", subfolder, ver)) break;
-			if (get_path_system(path, "scripts", subfolder, "BLENDER_SYSTEM_SCRIPTS", ver)) break;
-			return NULL;
-			
-		case BLENDER_SYSTEM_PYTHON:
-			if (get_path_local(path, "python", subfolder, ver)) break;
-			if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
-			return NULL;
-	}
-	
-	return path;
-}
-
-char *BLI_get_user_folder_notest(int folder_id, const char *subfolder)
-{
-	const int ver= BLENDER_VERSION;
-	static char path[FILE_MAX] = "";
-
-	switch (folder_id) {
-		case BLENDER_USER_DATAFILES:
-			get_path_user(path, "datafiles", subfolder, "BLENDER_USER_DATAFILES", ver);
-			break;
-		case BLENDER_USER_CONFIG:
-			get_path_user(path, "config", subfolder, "BLENDER_USER_CONFIG", ver);
-			break;
-		case BLENDER_USER_AUTOSAVE:
-			get_path_user(path, "autosave", subfolder, "BLENDER_USER_AUTOSAVE", ver);
-			break;
-		case BLENDER_USER_SCRIPTS:
-			get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver);
-			break;
-	}
-	if ('\0' == path[0]) {
-		return NULL;
-	}
-	return path;
-}
-
-char *BLI_get_folder_create(int folder_id, const char *subfolder)
-{
-	char *path;
-
-	/* only for user folders */
-	if (!ELEM4(folder_id, BLENDER_USER_DATAFILES, BLENDER_USER_CONFIG, BLENDER_USER_SCRIPTS, BLENDER_USER_AUTOSAVE))
-		return NULL;
-	
-	path = BLI_get_folder(folder_id, subfolder);
-	
-	if (!path) {
-		path = BLI_get_user_folder_notest(folder_id, subfolder);
-		if (path) BLI_dir_create_recursive(path);
-	}
-	
-	return path;
-}
-
-char *BLI_get_folder_version(const int id, const int ver, const int do_check)
-{
-	static char path[FILE_MAX] = "";
-	int ok;
-	switch(id) {
-	case BLENDER_RESOURCE_PATH_USER:
-		ok= get_path_user(path, NULL, NULL, NULL, ver);
-		break;
-	case BLENDER_RESOURCE_PATH_LOCAL:
-		ok= get_path_local(path, NULL, NULL, ver);
-		break;
-	case BLENDER_RESOURCE_PATH_SYSTEM:
-		ok= get_path_system(path, NULL, NULL, NULL, ver);
-		break;
-	default:
-		path[0]= '\0'; /* in case do_check is false */
-		ok= FALSE;
-		BLI_assert(!"incorrect ID");
-	}
-
-	if ((ok == FALSE) && do_check) {
-		return NULL;
-	}
-
-	return path;
-}
-
-/* End new stuff */
-/* ************************************************************* */
-/* ************************************************************* */
-
-
-
-#ifdef PATH_DEBUG
-#undef PATH_DEBUG
-#endif
-
-void BLI_setenv(const char *env, const char*val)
-{
-	/* free windows */
-#if (defined(WIN32) || defined(WIN64)) && defined(FREE_WINDOWS)
-	char *envstr= MEM_mallocN(sizeof(char) * (strlen(env) + strlen(val) + 2), "envstr"); /* one for = another for \0 */
-
-	sprintf(envstr, "%s=%s", env, val);
-	putenv(envstr);
-	MEM_freeN(envstr);
-
-	/* non-free windows */
-#elif (defined(WIN32) || defined(WIN64)) /* not free windows */
-	uputenv(env, val);
-
-
-#else
-	/* linux/osx/bsd */
-	setenv(env, val, 1);
-#endif
-}
-
-
-/**
- * Only set an env var if already not there.
- * Like Unix setenv(env, val, 0);
- */
-void BLI_setenv_if_new(const char *env, const char* val)
-{
-	if (getenv(env) == NULL)
-		BLI_setenv(env, val);
-}
-
-
-void BLI_clean(char *path)
-{
-	if (path==NULL) return;
-
-#ifdef WIN32
-	if (path && BLI_strnlen(path, 3) > 2) {
-		BLI_char_switch(path+2, '/', '\\');
-	}
-#else
-	BLI_char_switch(path, '\\', '/');
-#endif
-}
-
-void BLI_char_switch(char *string, char from, char to) 
-{
-	if (string==NULL) return;
-	while (*string != 0) {
-		if (*string == from) *string = to;
-		string++;
-	}
-}
-
-void BLI_make_exist(char *dir)
-{
-	int a;
-
-	BLI_char_switch(dir, ALTSEP, SEP);
-
-	a = strlen(dir);
-
-	while (BLI_is_dir(dir) == 0) {
-		a --;
-		while (dir[a] != SEP) {
-			a--;
-			if (a <= 0) break;
-		}
-		if (a >= 0) {
-			dir[a+1] = '\0';
-		}
-		else {
-#ifdef WIN32
-			get_default_root(dir);
-#else
-			strcpy(dir,"/");
-#endif
-			break;
-		}
-	}
-}
-
-void BLI_make_existing_file(const char *name)
-{
-	char di[FILE_MAX], fi[FILE_MAXFILE];
-
-	BLI_strncpy(di, name, sizeof(di));
-	BLI_splitdirstring(di, fi);
-	
-	/* test exist */
-	if (BLI_exists(di) == 0) {
-		BLI_dir_create_recursive(di);
-	}
-}
-
-
-void BLI_make_file_string(const char *relabase, char *string,  const char *dir, const char *file)
-{
-	int sl;
-
-	if (string) {
-		/* ensure this is always set even if dir/file are NULL */
-		string[0]= '\0';
-
-		if (ELEM(NULL, dir, file)) {
-			return; /* We don't want any NULLs */
-		}
-	}
-	else {
-		return; /* string is NULL, probably shouldnt happen but return anyway */
-	}
-
-
-	/* we first push all slashes into unix mode, just to make sure we don't get