[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/files/

[Andreas Sturmlechner]

commit:     5ffe8fc54f90bbee6b294ff7cc991406efb689c5
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 24 20:42:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 17:57:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffe8fc5

media-libs/opencollada: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12320
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/opencollada-build-fixes-v3.patch         | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/media-libs/opencollada/files/opencollada-build-fixes-v3.patch b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
deleted file mode 100644
index a0e055dfc35..00000000000
--- a/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-01-07 18:10:57.214728093 +0000
-+++ b/CMakeLists.txt	2017-01-07 18:11:06.322736320 +0000
-@@ -37,12 +37,6 @@ cmake_policy(SET CMP0010 NEW)
- # Input directories must have CMakeLists.txt
- cmake_policy(SET CMP0014 NEW)
- 
--# avoid having empty buildtype
--set(CMAKE_BUILD_TYPE_INIT "Release")
--
--set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release and Debug" FORCE )
--mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
--
- SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
- 
- #-----------------------------------------------------------------------------
-@@ -84,7 +78,7 @@ macro(opencollada_add_lib
- 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
- 		endif ()
- 		add_library(${name}_shared SHARED ${sources})
--		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_shared)
- 				target_link_libraries(${name}_shared ${target_lib}_shared)
-@@ -158,6 +152,9 @@ set(OPENCOLLADA_VERSION_MINOR 1)
- set(OPENCOLLADA_VERSION_PATCH 0)
- set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
- 
-+#-----------------------------------------------------------------------------
-+# Generic install paths
-+include(GNUInstallDirs)
- 
- #-----------------------------------------------------------------------------
- # Compiler warnings.
-@@ -190,9 +187,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
- #-----------------------------------------------------------------------------
- # Install vars
- 
--set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
--set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
--set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
-+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
-+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
-+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake)
- 
- 
- #-----------------------------------------------------------------------------
-@@ -236,8 +233,7 @@ endif ()
- 
- if (USE_EXPAT)
- 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)
--	message("FATAL: EXPAT support not implemented")
--	# TODO:: use externals
-+	set(LIBEXPAT_LIBRARIES expat)
- endif ()
- 
- if(USE_STATIC_MSVC_RUNTIME)