reinit the tree, so we can have metadata

6 files changed, 233 insertions, 0 deletions

diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
new file mode 100644
index 000000000000..9086acf79214
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt	2012-01-15 23:14:49.478520648 +0100

++++ b/CMakeLists.txt	2012-01-15 23:15:06.947302261 +0100

+@@ -208,8 +208,7 @@

+ 

+ if (USE_EXPAT)

+ 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)

+-	message("FATAL: EXPAT support not implemented")

+-	# TODO:: use externals

++	set(LIBEXPAT_LIBRARIES expat)

+ endif ()

+ 

+ #adding PCRE

diff --git a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
new file mode 100644
index 000000000000..cc413f3ededc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96ccb32..c2673f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,6 +146,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.
+@@ -178,9 +181,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
+ #-----------------------------------------------------------------------------
+ # 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)
+ 
+ 
+ #-----------------------------------------------------------------------------
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
new file mode 100644
index 000000000000..e3cbf0dbead9
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
@@ -0,0 +1,35 @@
+Source: https://build.opensuse.org/package/show/graphics/openCOLLADA
+
+Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
+===================================================================
+--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt
++++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
+@@ -28,7 +28,10 @@ set(SRC
+ 	include/performanceTest/performanceTest.h
+ )
+ 
+-set(TARGET_LIBS ftoa)
++set(TARGET_LIBS
++	ftoa
++	UTF
++)
+ 
+ include_directories(
+ 	${libBuffer_include_dirs}
+Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
+===================================================================
+--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt
++++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
+@@ -244,10 +244,10 @@ else ()  # if pcre not found building it
+ endif ()
+ 
+ # building required libs
++add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
++add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ add_subdirectory(common/libftoa)
+ add_subdirectory(common/libBuffer)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ 
+ # building OpenCOLLADA libs
+ add_subdirectory(COLLADABaseUtils)
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
new file mode 100644
index 000000000000..beef35545538
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
@@ -0,0 +1,15 @@
+Source:
+https://build.opensuse.org/package/show/graphics/openCOLLADA
+
+diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
+--- OpenCOLLADA.orig/CMakeLists.txt	2013-08-10 02:00:51.000000000 -0500
++++ OpenCOLLADA/CMakeLists.txt	2013-08-28 10:34:50.122102989 -0500
+@@ -77,7 +77,7 @@
+ 			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)
diff --git a/media-libs/opencollada/files/opencollada-build-fixes-v1.patch b/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
new file mode 100644
index 000000000000..171b45debb34
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
@@ -0,0 +1,86 @@
+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)
+@@ -270,10 +266,10 @@ else ()  # if pcre not found building it
+ endif ()
+ 
+ # building required libs
++add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
++add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ add_subdirectory(common/libftoa)
+ add_subdirectory(common/libBuffer)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ 
+ # building OpenCOLLADA libs
+ add_subdirectory(COLLADABaseUtils)
+diff -purN a/common/libBuffer/CMakeLists.txt b/common/libBuffer/CMakeLists.txt
+--- a/common/libBuffer/CMakeLists.txt	2016-11-30 17:19:38.000000000 +0000
++++ b/common/libBuffer/CMakeLists.txt	2017-01-07 18:05:50.306440325 +0000
+@@ -28,7 +28,10 @@ set(SRC
+ 	include/performanceTest/performanceTest.h
+ )
+ 
+-set(TARGET_LIBS ftoa)
++set(TARGET_LIBS
++	ftoa
++	UTF
++)
+ 
+ include_directories(
+ 	${libBuffer_include_dirs}
diff --git a/media-libs/opencollada/files/opencollada-build-fixes-v3.patch b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
new file mode 100644
index 000000000000..a0e055dfc351
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
@@ -0,0 +1,58 @@
+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)