From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- media-libs/opencollada/Manifest | 5 +- .../files/opencollada-1.6.62-cmake-fixes.patch | 122 --------------------- .../opencollada/opencollada-1.6.63-r1.ebuild | 72 ------------ media-libs/opencollada/opencollada-1.6.68.ebuild | 4 +- 4 files changed, 3 insertions(+), 200 deletions(-) delete mode 100644 media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch delete mode 100644 media-libs/opencollada/opencollada-1.6.63-r1.ebuild (limited to 'media-libs/opencollada') diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 4c21275b4754..cdd4cc7dfe2c 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,9 +1,6 @@ -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-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be -DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173 -EBUILD opencollada-1.6.63-r1.ebuild 1640 BLAKE2B 18ac545d76b9ebc99b5f85d44503e184fa195ec691ddc6cb2453ce9cd8d095784df884a029caba88cb1a962ea40a525efe309032a4bc93b1e69cbe05580b5b69 SHA512 04c9b1453208e360d449adb678876f0d6856704222e1cfeb5de4c1448f34b73b407c00235b62848a7fd9b6e4360dfd1be419a8815acbd7bf24f719d9169fbf75 -EBUILD opencollada-1.6.68.ebuild 1873 BLAKE2B ec57fd450e0f622999428485ff9dd4dc31ccbb9b4cab915a45794f8db6e29f0b8efa88ca28c7abca9a7221b1d32c3505dcb25be4b0353d5046988bc238343b2d SHA512 c64b0d3134fdeacc794e99615bd93c5aa9b0fc5caccb81a4d93da717019e24e5e986100d56bd2210e87df147614ad077d2622da37b70ff3c9b4b7b0241c058b5 +EBUILD opencollada-1.6.68.ebuild 1877 BLAKE2B 108145d10da5ca0146e551314129e630d237818cc07d6f41ed4f1d670ef1f15347355e5017661e76f20ecc14493e90d38299ae9b6ed1fe2890b1a10abc375fc1 SHA512 269201ce5a76a2ce3d6345e230a49501fd5caa0c73faef446668fe60221a7033a70a27ea1559c240dc720d823abb9a55531e61ec530e16713f09601a743dd518 MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c diff --git a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch deleted file mode 100644 index 8fc32784daa7..000000000000 --- a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch +++ /dev/null @@ -1,122 +0,0 @@ -From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs -Date: Sat, 13 Jan 2018 11:54:44 +0000 -Subject: [PATCH] OpenCOLLADA/CMakeLists.txt - -Use CMAKE_BUILD_TYPE which can be overrided with custom distro types - -Adhere to GNU filesystem layout conventions. Not all distros and OSes -have directories in the same locations and they define the -GNUInstallDirs variables, so use those variables. Also, this enables -multi lib installations. - -Define the version variables to enable SONAME versioning on the -library files in case there is ABI changes in the future. ---- - CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 36 insertions(+), 22 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95abbe21..00ad8d6a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,14 +37,41 @@ 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 Release type for builds where CMAKE_BUILD_TYPE is unset -+# This is usually a good default as this implictly enables -+# -+# CXXFLAGS = -O3 -DNDEBUG -+# -+if( NOT CMAKE_BUILD_TYPE ) -+ set( CMAKE_BUILD_TYPE "Release" ) -+endif() - - SET(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " ) - -+# Adhere to GNU filesystem layout conventions -+include( GNUInstallDirs ) -+ -+ -+# #----------------------------------------------------------------------------- -+# Initialize project. -+ -+project(OPENCOLLADA) # must be after setting cmake_configuration_types -+ -+set(EXTERNAL_LIBRARIES ${OPENCOLLADA_SOURCE_DIR}/Externals) # external libraries -+set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules") -+ -+set(OPENCOLLADA_VERSION_MAJOR 1) -+set(OPENCOLLADA_VERSION_MINOR 6) -+set(OPENCOLLADA_VERSION_PATCH 62) -+set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH}) -+ -+if(NOT SOVERSION) -+ set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR} -+ CACHE STRING "Set the SO version in the SO name of the output library") -+endif() -+ -+ - #----------------------------------------------------------------------------- - # Macro's - -@@ -58,7 +85,7 @@ macro(opencollada_add_lib - - if (USE_STATIC) - add_library(${name}_static STATIC ${sources}) -- set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name}) -+ set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION}) - foreach(target_lib ${target_libs}) - if(TARGET ${target_lib}_static) - target_link_libraries(${name}_static ${target_lib}_static) -@@ -84,7 +111,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) -@@ -145,19 +172,6 @@ endmacro() - # end copy - # -------- - --#----------------------------------------------------------------------------- --# Initialize project. -- --project(OPENCOLLADA) # must be after setting cmake_configuration_types -- --set(EXTERNAL_LIBRARIES ${OPENCOLLADA_SOURCE_DIR}/Externals) # external libraries --set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules") -- --set(OPENCOLLADA_VERSION_MAJOR 0) --set(OPENCOLLADA_VERSION_MINOR 1) --set(OPENCOLLADA_VERSION_PATCH 0) --set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH}) -- - - #----------------------------------------------------------------------------- - # Compiler warnings. -@@ -190,9 +204,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}/cmake/OpenCOLLADA) - - - #----------------------------------------------------------------------------- --- -2.15.1 - diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild deleted file mode 100644 index 1ed2b159eba1..000000000000 --- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils flag-o-matic - -DESCRIPTION="Stream based read/write library for COLLADA files" -HOMEPAGE="http://www.opencollada.org/" -SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="static-libs" - -RDEPEND="dev-libs/libpcre - dev-libs/libxml2 - dev-libs/zziplib - sys-libs/zlib -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/OpenCOLLADA-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch" - "${FILESDIR}/${P}-pcre-fix.patch" -) - -src_prepare() { - edos2unix CMakeLists.txt - - cmake-utils_src_prepare - - # Remove bundled depends that have portage equivalents - rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die - - # Remove unused build systems - rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die - find "${S}" -name SConscript -delete || die -} - -src_configure() { - # bug 619670 - append-cxxflags -std=c++14 - - local mycmakeargs=( - -DUSE_SHARED=ON - -DUSE_STATIC=$(usex static-libs) - -DUSE_LIBXML=ON - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed" - doenvd "${T}"/99${PN} - - dobin "${BUILD_DIR}/bin/DAEValidator" - dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator" - # Need to be in same directory as above binaries - docinto "/usr/bin" - dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd" - dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd" - dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd" -} diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild index 9be28a0a789c..ec8c164459ae 100644 --- a/media-libs/opencollada/opencollada-1.6.68.ebuild +++ b/media-libs/opencollada/opencollada-1.6.68.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc64 x86" IUSE="static-libs" RDEPEND=" -- cgit v1.2.3