Update Ceres to latest upstream version

Brings new bounds limiting and also prepares build system
for the changes in the upstream.

Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.

This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D581

3 files changed, 1 insertions, 51 deletions

diff --git a/build_files/scons/config/Modules/FindPython.py b/build_files/scons/config/Modules/FindPython.py
deleted file mode 100644
index a0ead88ebb4..00000000000
--- a/build_files/scons/config/Modules/FindPython.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import os
-import platform
-
-def FindPython():
-    all_abi_flags = ['m', 'mu', '']
-
-    python = "/usr"
-    abi_flags = "m"  # Most common for linux distros
-    version = "3.4"
-
-    _arch = platform.uname()[4] + "-linux-gnu"
-
-    # Determine ABI flags used on this system
-    include = os.path.join(python, "include")
-    for cur_flags in all_abi_flags:
-        inc = os.path.join(include, "python" + version + cur_flags, "Python.h")
-        if os.path.exists(inc):
-            abi_flags = cur_flags
-            break
-
-    # Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir.
-    incconf = os.path.join(include, _arch, "python" + version + cur_flags)
-    if not os.path.exists(os.path.join(incconf, "pyconfig.h")):
-        incconf = ''
-
-    # Determine whether python is in /usr/lib or /usr/lib64
-    lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py")
-    lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py")
-    if os.path.exists(lib32):
-        libpath = "${BF_PYTHON}/lib"
-    elif os.path.exists(lib64):
-        libpath = "${BF_PYTHON}/lib64"
-    else:
-        # roll back to default value
-        libpath = "${BF_PYTHON}/lib"
-
-    libpath_arch = libpath
-    _libpath_arch = os.path.join(python, "lib", _arch)  # No lib64 stuff with recent deb-like distro afaik...
-    _libs = ["libpython" + version + abi_flags + ext for ext in (".so", ".a")]
-    for l in _libs:
-        if not os.path.exists(os.path.join(libpath, l)) and os.path.exists(os.path.join(_libpath_arch, l)):
-            libpath_arch = os.path.join(libpath, _arch)
-            break
-
-    return {"PYTHON": python,
-            "VERSION": version,
-            "LIBPATH": libpath,
-            "LIBPATH_ARCH": libpath_arch,
-            "ABI_FLAGS": abi_flags,
-            "CONFIG": incconf}
diff --git a/build_files/scons/config/Modules/__init__.py b/build_files/scons/config/Modules/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/build_files/scons/config/Modules/__init__.py
+++ /dev/null
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 8f2c5ca30f4..0c76aecfc4b 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -1,4 +1,4 @@
-from Modules.FindPython import FindPython
+from FindPython import FindPython
 
 py = FindPython()