mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-libs/opencollada: version bump to 1.6.58.
* Updated the build fixes patch. Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/5749
This commit is contained in:
Jonathan Scruggs
committed by
Patrice Clement
Patrice Clement
parent
b1bdeceb98
commit
ee2afb323a
@@ -1,3 +1,4 @@
|
||||
DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87
|
||||
DIST opencollada-1.6.31.tar.gz 11832790 SHA256 ef338d03646da3039cf67382b19f39fe51aa638e05213ba9ad6a41f8069ad683 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9 WHIRLPOOL 6ad70665178e54bd93c431c6fe6c03800fc62a99e845c54a502d21e995b77dd6d1f5624aa2d70a03ba271bdfb5d60a0b9b9ac876ab8a14e14308458eea1118ab
|
||||
DIST opencollada-1.6.36.tar.gz 12275972 SHA256 774b41611ab3ebb3a6008d32bcfd326d4ac1545d5316ba383b4ae90f16335701 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8 WHIRLPOOL 2184e01d903f662afa94369445336d510bcc9a5f9e1a54677476d41cf920052f9fab5190e8f2c2ddc775ee0062e7cbb5f0a1c1b120d2476217ff78ccd9c38b8b
|
||||
DIST opencollada-1.6.58.tar.gz 12088428 SHA256 13ce6e8f6162683afba4b1c5b3dfc752db3ded382da7b88bda48982db4941c8b SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9 WHIRLPOOL 4b0cda528494348769c861bc166403c673d59fffc844710dffa1ab0b0aca1fd36e3ea92c7a140f3d80653f0d4d9d268e4b35f898496729cdb1bbe262f765bc3f
|
||||
|
||||
@@ -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)
|
||||
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
|
||||
IUSE="static-libs"
|
||||
|
||||
@@ -61,5 +61,5 @@ src_install() {
|
||||
echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
|
||||
doenvd "${T}"/99${PN}
|
||||
|
||||
dobin ${BUILD_DIR}/bin/OpenCOLLADAValidator
|
||||
dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
|
||||
}
|
||||
|
||||
69
media-libs/opencollada/opencollada-1.6.58.ebuild
Normal file
69
media-libs/opencollada/opencollada-1.6.58.ebuild
Normal file
@@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils versionator
|
||||
|
||||
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"
|
||||
|
||||
# This is still needed to have so version numbers
|
||||
MY_SOVERSION="$(get_version_component_range 1-2)"
|
||||
|
||||
RDEPEND="dev-libs/libpcre
|
||||
dev-libs/zziplib
|
||||
media-libs/lib3ds
|
||||
sys-libs/zlib
|
||||
dev-libs/libxml2"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/OpenCOLLADA-${PV}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-build-fixes-v3.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() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_SHARED=ON
|
||||
-DUSE_STATIC=$(usex static-libs)
|
||||
-DUSE_LIBXML=ON
|
||||
-Dsoversion=${MY_SOVERSION}
|
||||
)
|
||||
|
||||
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"
|
||||
}
|
||||
Reference in New Issue
Block a user