drop eos, pop version, refactor patches

1 files changed, 40 insertions, 45 deletions

diff --git a/python.patch b/python.patch
index 7d4c4d4f0ab8..51bede663a3f 100644
--- a/python.patch
+++ b/python.patch
@@ -1,19 +1,8 @@
-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.4)
-+	find_package(PythonLibs)
- endif()
- 
- find_program(PYSIDE_UIC NAME pyside-uic
-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 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4a073f2e..4025bc894 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,10 @@ MESSAGE(STATUS "CMake version " ${CMAKE_VERSION} " detected")
  cmake_minimum_required(VERSION 3.5.1)
  cmake_policy(VERSION 3.0)
  
@@ -24,58 +13,64 @@ diff -Naur orig/LuxCore-luxcorerender_v2.0/CMakeLists.txt LuxCore-luxcorerender_
  # 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 @@
+diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
+index dc3f5d8cf..a8b429814 100644
+--- a/samples/luxcoreconsole/CMakeLists.txt
++++ b/samples/luxcoreconsole/CMakeLists.txt
+@@ -28,4 +28,4 @@ set(LUXCORECONSOLE_SRCS
  
  add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
  
 -TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
-\ Brak znaku nowej linii na końcu pliku
+\ No newline at end of file
 +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 @@
+diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
+index c140dc23b..c8cba9880 100644
+--- a/samples/luxcoredemo/CMakeLists.txt
++++ b/samples/luxcoredemo/CMakeLists.txt
+@@ -29,4 +29,4 @@ set(LUXCORELIBDEMO_SRCS
  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 @@
+diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt
+index 90c1967cd..aa024f650 100644
+--- a/samples/luxcorescenedemo/CMakeLists.txt
++++ b/samples/luxcorescenedemo/CMakeLists.txt
+@@ -29,4 +29,4 @@ set(LUXCORESCENEDEMO_SRCS
  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 @@
+diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
+index 33b50b3d0..ba1982a42 100644
+--- a/samples/luxcoreui/CMakeLists.txt
++++ b/samples/luxcoreui/CMakeLists.txt
+@@ -88,4 +91,5 @@ TARGET_LINK_LIBRARIES(luxcoreui
  	${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 @@
+diff --git a/tests/benchsimple/CMakeLists.txt b/tests/benchsimple/CMakeLists.txt
+index 3ac004b2b..b2abe340c 100644
+--- a/tests/benchsimple/CMakeLists.txt
++++ b/tests/benchsimple/CMakeLists.txt
+@@ -22,4 +22,4 @@ link_directories (${LuxRays_LIB_DIR})
  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
-@@ -30,4 +30,4 @@
-
+diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+index c8d9c4aa9..1dc6b7c63 100644
+--- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
++++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+@@ -30,4 +30,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/bcd-1.1/include)
+ 
  add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
-
--TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd 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 bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ 
+-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${OIDN_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 bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})