diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
| commit | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch) | |
| tree | f2cbbaa8bb9209cd15208721103228336149b799 /media-libs/opencollada | |
| parent | 7a86906b67693cc65671d3e1476835d3a7e13092 (diff) | |
gentoo resync : 30.06.2019
Diffstat (limited to 'media-libs/opencollada')
| -rw-r--r-- | media-libs/opencollada/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/opencollada/files/opencollada-build-fixes-v3.patch | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index e1f3a812fb2b..4a090f2259c3 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,6 +1,5 @@ AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55 -AUX opencollada-build-fixes-v3.patch 2571 BLAKE2B 013f45412ced572d9fbc29764942d7dac7c2320aa661b567d34e76beaa46d57386898cedcb817458da20146a72d657ae0866acf70034bf3063210d742301be5d SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01 EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae 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 a0e055dfc351..000000000000 --- 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) |