summarylogtreecommitdiffstats
path: root/python.patch
diff options
context:
space:
mode:
authorbartus2018-05-11 23:03:21 +0200
committerbartus2018-05-11 23:03:21 +0200
commite46ac93b140bd7b5ad4f86c12157dda8a678d149 (patch)
tree69afd96f7a6b8756ed9e83973e7d9df530bdccd4 /python.patch
downloadaur-e46ac93b140bd7b5ad4f86c12157dda8a678d149.tar.gz
init
Diffstat (limited to 'python.patch')
-rw-r--r--python.patch90
1 files changed, 90 insertions, 0 deletions
diff --git a/python.patch b/python.patch
new file mode 100644
index 000000000000..5cbde7a397d3
--- /dev/null
+++ b/python.patch
@@ -0,0 +1,90 @@
+diff -Naur orig/LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake
+--- orig/LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake 2018-05-11 16:22:01.774281916 +0200
+@@ -43,7 +43,7 @@
+ find_package(PNG REQUIRED)
+ include_directories(BEFORE SYSTEM ${PNG_PNG_INCLUDE_DIR})
+ # Find Python Libraries
+- find_package(PythonLibs 3.5)
++ find_package(PythonLibs)
+ endif()
+
+ find_program(PYSIDE_UIC NAME pyside-uic
+@@ -63,7 +63,7 @@
+
+ set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0")
+
+-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python chrono serialization)
++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3 chrono serialization)
+ find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS})
+ if (NOT Boost_FOUND)
+ # Try again with the other type of libs
+diff -Naur orig/LuxCore-luxcorerender_v2.0/CMakeLists.txt LuxCore-luxcorerender_v2.0/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/CMakeLists.txt 2018-05-11 16:30:33.742293724 +0200
+@@ -28,6 +28,10 @@
+ cmake_minimum_required(VERSION 3.5.1)
+ cmake_policy(VERSION 3.0)
+
++if(POLICY CMP0072)
++ cmake_policy(SET CMP0072 OLD)
++endif()
++
+ # Remove the following when the version check is at least 2.8.4
+ SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
+
+diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -28,4 +28,4 @@
+
+ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
+
+-TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
+\ Brak znaku nowej linii na końcu pliku
++TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
+diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -29,4 +29,4 @@
+ add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+
+-TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
+diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -29,4 +29,4 @@
+ add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+
+-TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
+diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -88,4 +88,5 @@
+ ${OPENGL_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${Boost_LIBRARIES}
++ ${PYTHON_LIBRARIES}
+ ${OPENCL_LIBRARIES})
+diff -Naur orig/LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -22,4 +22,4 @@
+ add_executable(benchsimple benchsimple.cpp)
+ add_definitions(${VISIBILITY_FLAGS})
+ remove_definitions("-DLUXCORE_DLL")
+-target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${TBB_LIBRARY} )
++target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} )
+diff -Naur orig/LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt
+--- orig/LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
++++ LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
+@@ -28,4 +28,4 @@
+
+ add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
+
+-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})