[SCM] opencollada/master: debian/patches/: patchset updated
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Fri Mar 11 07:46:53 UTC 2016
The following commit has been merged in the master branch:
commit 61e25a43efca7e10e14d79bee0925e1aaa933951
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Thu Mar 10 20:49:19 2016 +0100
debian/patches/: patchset updated
- mips-build-workaround.diff added
Closes: #794276
diff --git a/debian/patches/mips-build-workaround.diff b/debian/patches/mips-build-workaround.diff
new file mode 100644
index 0000000..44d3aff
--- /dev/null
+++ b/debian/patches/mips-build-workaround.diff
@@ -0,0 +1,33 @@
+diff -upNr OpenCOLLADA-orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
+--- OpenCOLLADA-orig/CMakeLists.txt 2016-03-01 18:34:27.589176369 +0000
++++ OpenCOLLADA/CMakeLists.txt 2016-03-01 18:43:21.441683364 +0000
+@@ -1,3 +1,5 @@
++EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
++message( STATUS "Architecture: ${ARCHITECTURE}" )
+
+ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+ if(NOT DEFINED WITH_IN_SOURCE_BUILD)
+@@ -63,6 +65,11 @@ macro(opencollada_add_lib
+ else()
+ target_link_libraries(${name}_static ${target_lib})
+ endif()
++ if( ${ARCHITECTURE} MATCHES "mips" )
++ if(TARGET OpenCOLLADASaxFrameworkLoader_static)
++ SET_TARGET_PROPERTIES(OpenCOLLADASaxFrameworkLoader_static PROPERTIES COMPILE_FLAGS "-Umips")
++ endif()
++ endif()
+ endforeach()
+ set(CMAKE_REQUIRED_LIBRARIES "${name}_static;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE)
+
+@@ -84,6 +91,11 @@ macro(opencollada_add_lib
+ else()
+ target_link_libraries(${name}_shared ${target_lib})
+ endif()
++ if( ${ARCHITECTURE} MATCHES "mips" )
++ if(TARGET OpenCOLLADASaxFrameworkLoader_shared)
++ SET_TARGET_PROPERTIES(OpenCOLLADASaxFrameworkLoader_shared PROPERTIES COMPILE_FLAGS "-Umips")
++ endif()
++ endif()
+ endforeach()
+ set(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE)
+
diff --git a/debian/patches/series b/debian/patches/series
index 7d34698..6e9f17d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
opencollada.libxml.patch.0
fix-cmake-config.diff
fPIC.diff
+mips-build-workaround.diff
\ No newline at end of file
--
opencollada packaging
More information about the pkg-multimedia-commits
mailing list