diff options
Diffstat (limited to 'graphics/mitsuba/files')
9 files changed, 0 insertions, 203 deletions
diff --git a/graphics/mitsuba/files/patch-data_cmake_MitsubaBuildOptions.cmake b/graphics/mitsuba/files/patch-data_cmake_MitsubaBuildOptions.cmake deleted file mode 100644 index c5bb46a4f4c3..000000000000 --- a/graphics/mitsuba/files/patch-data_cmake_MitsubaBuildOptions.cmake +++ /dev/null @@ -1,21 +0,0 @@ ---- data/cmake/MitsubaBuildOptions.cmake.orig 2015-07-15 10:37:38 UTC -+++ data/cmake/MitsubaBuildOptions.cmake -@@ -8,11 +8,16 @@ endif() - - # Default initial compiler flags which may be modified by advanced users - if (MTS_CMAKE_INIT) -- set(MTS_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+# set(MTS_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ set(MTS_CXX_FLAGS "${MTS_CXX_FLAGS} -msse2") - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") -- set(MTS_CXX_FLAGS "-fvisibility=hidden -pipe -march=nocona -ffast-math -Wall -Winvalid-pch") -+ set(MTS_CXX_FLAGS "${MTS_CXX_FLAGS} -fvisibility=hidden -Wall -Winvalid-pch") - endif() - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") -+ if (NOT CMAKE_CXX_FLAGS MATCHES "-march") -+ message (STATUS "No -march specified, defaulting to i586 (required for atomics support)") -+ set(MTS_CXX_FLAGS "${MTS_CXX_FLAGS} -march=i586") -+ endif() - set(MTS_CXX_FLAGS "${MTS_CXX_FLAGS} -mfpmath=sse") - endif() - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/graphics/mitsuba/files/patch-include_mitsuba_core_constants.h b/graphics/mitsuba/files/patch-include_mitsuba_core_constants.h deleted file mode 100644 index 8b24194502ba..000000000000 --- a/graphics/mitsuba/files/patch-include_mitsuba_core_constants.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/mitsuba/core/constants.h.orig 2015-07-15 10:37:38 UTC -+++ include/mitsuba/core/constants.h -@@ -43,10 +43,6 @@ - #undef M_PI - #endif - --#ifdef INFINITY --#undef INFINITY --#endif -- - #if defined(__WINDOWS__) - #define ONE_MINUS_EPS_FLT 0.999999940395355225f - #define ONE_MINUS_EPS_DBL 0.999999999999999888 diff --git a/graphics/mitsuba/files/patch-include_mitsuba_core_platform.h b/graphics/mitsuba/files/patch-include_mitsuba_core_platform.h deleted file mode 100644 index c4b43075a43d..000000000000 --- a/graphics/mitsuba/files/patch-include_mitsuba_core_platform.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/mitsuba/core/platform.h.orig 2015-07-15 10:37:38 UTC -+++ include/mitsuba/core/platform.h -@@ -70,6 +70,11 @@ - #if !defined(_GNU_SOURCE) - #define _GNU_SOURCE - #endif -+#elif defined(__FreeBSD__) -+ // Try to masquerade as Linux by default (to reduce the amount of -+ // patching); when linuxisms won't work, we'd check for __FreeBSD__ -+ // explicitly first. -+ #define __LINUX__ - #else - #error Unknown OS - #endif diff --git a/graphics/mitsuba/files/patch-include_mitsuba_core_qmc.h b/graphics/mitsuba/files/patch-include_mitsuba_core_qmc.h deleted file mode 100644 index 1f7d8c7d7fcc..000000000000 --- a/graphics/mitsuba/files/patch-include_mitsuba_core_qmc.h +++ /dev/null @@ -1,20 +0,0 @@ ---- include/mitsuba/core/qmc.h.orig 2015-07-15 10:37:38 UTC -+++ include/mitsuba/core/qmc.h -@@ -42,7 +42,7 @@ extern const int MTS_EXPORT_CORE primeTa - /// Van der Corput radical inverse in base 2 with single precision - inline float radicalInverse2Single(uint32_t n, uint32_t scramble = 0U) { - /* Efficiently reverse the bits in 'n' using binary operations */ --#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || defined(__clang__) - n = __builtin_bswap32(n); - #else - n = (n << 16) | (n >> 16); -@@ -61,7 +61,7 @@ inline float radicalInverse2Single(uint3 - /// Van der Corput radical inverse in base 2 with double precision - inline double radicalInverse2Double(uint64_t n, uint64_t scramble = 0ULL) { - /* Efficiently reverse the bits in 'n' using binary operations */ --#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || defined(__clang__) - n = __builtin_bswap64(n); - #else - n = (n << 32) | (n >> 32); diff --git a/graphics/mitsuba/files/patch-include_mitsuba_render_gkdtree.h b/graphics/mitsuba/files/patch-include_mitsuba_render_gkdtree.h deleted file mode 100644 index e719065ef87f..000000000000 --- a/graphics/mitsuba/files/patch-include_mitsuba_render_gkdtree.h +++ /dev/null @@ -1,20 +0,0 @@ ---- include/mitsuba/render/gkdtree.h.orig 2015-07-15 10:37:38 UTC -+++ include/mitsuba/render/gkdtree.h -@@ -26,7 +26,7 @@ - #include <stack> - - #if defined(__LINUX__) --#include <malloc.h> -+#include <stdlib.h> - #endif - - /// Activate lots of extra checks -@@ -1256,7 +1256,7 @@ protected: - KDLog(m_logLevel, " Final cost : %.2f", heuristicCost); - KDLog(m_logLevel, ""); - -- #if defined(__LINUX__) -+ #if defined(__LINUX__) && !defined(__FreeBSD__) - /* Forcefully release Heap memory back to the OS */ - malloc_trim(0); - #endif diff --git a/graphics/mitsuba/files/patch-src_bsdfs_irawan.h b/graphics/mitsuba/files/patch-src_bsdfs_irawan.h deleted file mode 100644 index 10a5f4d0a25d..000000000000 --- a/graphics/mitsuba/files/patch-src_bsdfs_irawan.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/bsdfs/irawan.h.orig 2015-07-15 10:37:38 UTC -+++ src/bsdfs/irawan.h -@@ -28,9 +28,6 @@ - #include <boost/spirit/include/phoenix_operator.hpp> - #include <boost/spirit/include/phoenix_stl.hpp> - #include <boost/spirit/home/qi/numeric/real.hpp> --#include <boost/spirit/home/phoenix/bind/bind_member_variable.hpp> --#include <boost/spirit/home/phoenix/bind/bind_member_function.hpp> --#include <boost/spirit/home/phoenix/statement/if.hpp> - - MTS_NAMESPACE_BEGIN - diff --git a/graphics/mitsuba/files/patch-src_libcore_thread.cpp b/graphics/mitsuba/files/patch-src_libcore_thread.cpp deleted file mode 100644 index 7c05a2778d47..000000000000 --- a/graphics/mitsuba/files/patch-src_libcore_thread.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- src/libcore/thread.cpp.orig 2015-07-15 10:37:38 UTC -+++ src/libcore/thread.cpp -@@ -28,7 +28,10 @@ - - // Required for native thread functions - #if defined(__LINUX__) --# include <sys/prctl.h> -+# include <pthread.h> -+# if defined(__FreeBSD__) -+# include <pthread_np.h> -+# endif - #elif defined(__OSX__) - # include <pthread.h> - #elif defined(__WINDOWS__) -@@ -320,7 +323,7 @@ void Thread::setCoreAffinity(int coreID) - if (!d->running) - return; - --#if defined(__OSX__) -+#if defined(__OSX__) || defined(__FreeBSD__) - /* CPU affinity not supported on OSX */ - #elif defined(__LINUX__) - int nCores = sysconf(_SC_NPROCESSORS_CONF), -@@ -440,10 +443,7 @@ void Thread::dispatch(Thread *thread) { - if (!thread->getName().empty()) { - const std::string threadName = "Mitsuba: " + thread->getName(); - #if defined(__LINUX__) -- // Disabled for now, since it is not yet widely available in glibc -- // pthread_setname_np(pthread_self(), threadName.c_str()); -- -- prctl(PR_SET_NAME, threadName.c_str()); -+ pthread_set_name_np(pthread_self(), threadName.c_str()); - #elif defined(__OSX__) - pthread_setname_np(threadName.c_str()); - #elif defined(__WINDOWS__) -@@ -638,7 +638,7 @@ void Thread::initializeOpenMP(size_t thr - const std::string threadName = "Mitsuba: " + thread->getName(); - - #if defined(__LINUX__) -- prctl(PR_SET_NAME, threadName.c_str()); -+ pthread_set_name_np(pthread_self(), threadName.c_str()); - #elif defined(__OSX__) - pthread_setname_np(threadName.c_str()); - #elif defined(__WINDOWS__) diff --git a/graphics/mitsuba/files/patch-src_libcore_timer.cpp b/graphics/mitsuba/files/patch-src_libcore_timer.cpp deleted file mode 100644 index a6127fdcb6f9..000000000000 --- a/graphics/mitsuba/files/patch-src_libcore_timer.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/libcore/timer.cpp.orig 2015-07-15 10:37:38 UTC -+++ src/libcore/timer.cpp -@@ -37,9 +37,6 @@ - // Assume POSIX. Check for good clock sources - # include <unistd.h> - # include <ctime> --# if _POSIX_C_SOURCE < 199309L --# error "The required POSIX clock functions are not available." --# endif - # if defined(_POSIX_MONOTONIC_CLOCK) - # define TIMER_CLOCK CLOCK_MONOTONIC - # elif defined(CLOCK_HIGHRES) diff --git a/graphics/mitsuba/files/patch-src_libcore_util.cpp b/graphics/mitsuba/files/patch-src_libcore_util.cpp deleted file mode 100644 index 4b22b12b4bdf..000000000000 --- a/graphics/mitsuba/files/patch-src_libcore_util.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- src/libcore/util.cpp.orig 2015-07-15 10:37:38 UTC -+++ src/libcore/util.cpp -@@ -35,7 +35,7 @@ - #include <direct.h> - #include <psapi.h> - #else --#include <malloc.h> -+#include <stdlib.h> - #endif - - #if defined(__WINDOWS__) -@@ -45,6 +45,7 @@ - #else - # include <sys/types.h> - # include <sys/socket.h> -+# include <netinet/in.h> - # include <netdb.h> - # include <fenv.h> - #endif -@@ -132,7 +133,10 @@ void * __restrict allocAligned(size_t si - for AltiVec and SSE computations */ - return malloc(size); - #else -- return memalign(L1_CACHE_LINE_SIZE, size); -+ void *ptr; -+ if (posix_memalign(&ptr, L1_CACHE_LINE_SIZE, size)) -+ ptr = NULL; -+ return ptr; - #endif - } - -@@ -172,6 +176,7 @@ int getCoreCount() { - /* Some of the cores may not be available to the user - (e.g. on certain cluster nodes) -- determine the number - of actual available cores here. */ -+#ifndef __FreeBSD__ - int nLogicalCores = nCores; - size_t size = 0; - cpu_set_t *cpuset = NULL; -@@ -208,6 +213,7 @@ int getCoreCount() { - availableCores += CPU_ISSET_S(i, size, cpuset) ? 1 : 0; - nCores = availableCores; - CPU_FREE(cpuset); -+#endif // __FreeBSD__ - } - - done: |