gentoo resync : 14.05.2020

4 files changed, 35 insertions, 41 deletions

diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch
deleted file mode 100644
index 9bf4f2b91f68..000000000000
--- a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/work/Blender-Exporter-3.3.0/__init__.py b/work/Blender-Exporter-3.3.0/__init__.py
-index 85dc1c2..70a79e8 100644
---- a/__init__.py
-+++ b/__init__.py
-@@ -22,8 +22,8 @@ import sys
- import os
- import ctypes
- 
--PLUGIN_PATH = os.path.join(__path__[0], 'bin', 'yafaray-plugins')
--BIN_PATH = os.path.join(__path__[0], 'bin')
-+PLUGIN_PATH = '/usr/lib/yafaray-plugins'
-+BIN_PATH = '/usr/bin'
- YAF_ID_NAME = "YAFA_V3_RENDER"
- 
- # Version to be automatically populated during the cmake build process, getting the version from git tags
diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch
deleted file mode 100644
index c22ff7e41ea6..000000000000
--- a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt
-index 75fd2c6..94c2502 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,9 +219,6 @@ if(NOT WIN32)
- 		set(YAF_BINDINGS_RUBY_DIR ${YAF_LIB_DIR})
- 	endif(NOT YAF_BINDINGS_RUBY_DIR)
- 
--	# build flags
--	set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
--	
- 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
- 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
- 	else(USER_RELEASE_OPTIMIZATION_FLAGS)
diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch
deleted file mode 100644
index 3bdb4eeef361..000000000000
--- a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt
-index 75fd2c6..52c6b3d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,7 +17,6 @@ option(WITH_YAF_PY_BINDINGS "Enable the YafaRay Python bindings" ON)
- option(WITH_YAF_RUBY_BINDINGS "Enable the YafaRay Ruby bindings" OFF)
- option(WITH_OSX_ADDON "Enable the use of blender's included python lib on OSX platforms" OFF)
- option(WITH_OpenCV "Build OpenCV image processing support" ON)
--option(DEBUG_BUILD "Enable debug build mode" OFF)
- option(EMBED_FONT_QT "Embed font for QT GUI (usefull for some buggy QT installations)" OFF)
- option(FAST_MATH "Enable mathematic approximations to make code faster" ON)
- option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON)
diff --git a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
new file mode 100644
index 000000000000..90b2786c3c54
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
@@ -0,0 +1,35 @@
+From 2f77edf05ed02955dc08821f322a529063dbfa28 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 19 Apr 2020 15:39:45 +0200
+Subject: [PATCH] Respect user pre-defined CXXFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 047456f..6733b7d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -224,7 +224,7 @@ if(NOT WIN32)
+ 	endif(NOT YAF_BINDINGS_RUBY_DIR)
+ 
+ 	# build flags
+-	set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
+ 	
+ 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
+@@ -263,7 +263,7 @@ else(NOT WIN32)
+ 
+ 	# build flags
+ 	if(MINGW)
+-		set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
++		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
+ 
+ 		if(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 			set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
+-- 
+2.26.1
+