* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/
@ 2017-01-15 11:14 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-01-15 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 48847536c6479332114935068725e76fd3e6c406
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Jan 14 17:30:36 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:14:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48847536
media-libs/opencollada: Version bump to 1.6.36
* General bug fix bump with no added features.
* Changed soname to use versionator eclass.
* Fixed out of source building.
Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/3361
media-libs/opencollada/Manifest | 1 +
.../files/opencollada-build-fixes-v1.patch | 86 ++++++++++++++++++++++
media-libs/opencollada/opencollada-1.6.36.ebuild | 68 +++++++++++++++++
3 files changed, 155 insertions(+)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 27cb178..acaa175 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,2 +1,3 @@
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
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 00000000..171b45d
--- /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/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
new file mode 100644
index 00000000..34c4aa6
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="expat 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
+ expat? ( dev-libs/expat )
+ !expat? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/OpenCOLLADA-${PV}
+
+PATCHES=( "${FILESDIR}"/${PN}-build-fixes-v1.patch )
+
+src_prepare() {
+ edos2unix CMakeLists.txt
+
+ cmake-utils_src_prepare
+
+ # Remove bundled depends that have portage equivalents
+ rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,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_EXPAT=$(usex expat)
+ -DUSE_LIBXML=$(usex !expat)
+ -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/OpenCOLLADAValidator
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/
@ 2018-01-30 21:00 Jonathan Scruggs
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Scruggs @ 2018-01-30 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 65833f7dc77f342cfbd705d2548cc76f32de2d8e
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 15:26:52 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 20:59:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65833f7d
media-libs/opencollada: add 1.6.2 release
Closes: https://github.com/gentoo/gentoo/pull/6997
media-libs/opencollada/Manifest | 1 +
.../files/opencollada-1.6.62-cmake-fixes.patch | 122 +++++++++++++++++++++
media-libs/opencollada/opencollada-1.6.62.ebuild | 65 +++++++++++
3 files changed, 188 insertions(+)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index d1542aa0bf5..536be7f94eb 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -2,3 +2,4 @@ DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 84278ae25d64ab827806c6ec588a333a
DIST opencollada-1.6.31.tar.gz 11832790 BLAKE2B 297130a8f844f4f80f4394db85098eaeaf42da125f34f20b4b6285c2bd0afc20c7066e3c54f73012c188b5b3c79f43be351fdc3b612b1e5c67ecc0ae19acb0f3 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9
DIST opencollada-1.6.36.tar.gz 12275972 BLAKE2B 3f7afb81767e92d1f6efeaf114caf0fa426d075ccd0fcd9f5c8e3951d7706329c545643cab8d18c05542d26933f3e016f96ca9931554b2929d8f815661917529 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8
DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
+DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
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
new file mode 100644
index 00000000000..8fc32784daa
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+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.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
new file mode 100644
index 00000000000..4a0d0c352bd
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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"
+
+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}/${P}-cmake-fixes.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
+ )
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/
@ 2018-06-10 9:19 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10 9:19 UTC (permalink / raw
To: gentoo-commits
commit: c116b96ca9e52ac260c8d9975e6f90c68065062c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 08:49:08 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 08:58:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c116b96c
media-libs/opencollada: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/opencollada/Manifest | 3 -
.../files/opencollada-0_p864-expat.patch | 12 ---
.../files/opencollada-1.2.2-libdir.patch | 27 -------
.../files/opencollada-1.2.2-no-undefined.patch | 35 ---------
.../files/opencollada-1.2.2-soversion.patch | 15 ----
.../files/opencollada-build-fixes-v1.patch | 86 ----------------------
media-libs/opencollada/opencollada-1.6.25.ebuild | 74 -------------------
media-libs/opencollada/opencollada-1.6.31.ebuild | 74 -------------------
media-libs/opencollada/opencollada-1.6.36.ebuild | 68 -----------------
9 files changed, 394 deletions(-)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 536be7f94eb..9bf5a7379e3 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,5 +1,2 @@
-DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 84278ae25d64ab827806c6ec588a333a7b0b70bb61c61ebfe98fa837e81e4c8737c8820b8eb555509cf6ea061dcafd1b93693a12169dd44cbe9695593f16331c SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e
-DIST opencollada-1.6.31.tar.gz 11832790 BLAKE2B 297130a8f844f4f80f4394db85098eaeaf42da125f34f20b4b6285c2bd0afc20c7066e3c54f73012c188b5b3c79f43be351fdc3b612b1e5c67ecc0ae19acb0f3 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9
-DIST opencollada-1.6.36.tar.gz 12275972 BLAKE2B 3f7afb81767e92d1f6efeaf114caf0fa426d075ccd0fcd9f5c8e3951d7706329c545643cab8d18c05542d26933f3e016f96ca9931554b2929d8f815661917529 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8
DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
deleted file mode 100644
index 9086acf7921..00000000000
--- a/media-libs/opencollada/files/opencollada-0_p864-expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index cc413f3eded..00000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index e3cbf0dbead..00000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index beef3554553..00000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 171b45debb3..00000000000
--- a/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
+++ /dev/null
@@ -1,86 +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)
-@@ -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/opencollada-1.6.25.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
deleted file mode 100644
index 251fc86c83b..00000000000
--- a/media-libs/opencollada/opencollada-1.6.25.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-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="expat static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="1.6"
-
-RDEPEND="dev-libs/libpcre
- dev-libs/zziplib
- media-libs/lib3ds
- sys-libs/zlib
- expat? ( dev-libs/expat )
- !expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}"/OpenCOLLADA-${PV}
-# This is needed or you get an error on install
-BUILD_DIR="${S}"/build
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0_p864-expat.patch
- "${FILESDIR}"/${PN}-1.2.2-soversion.patch
- "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
- "${FILESDIR}"/${PN}-1.2.2-libdir.patch
-)
-
-src_prepare() {
- edos2unix CMakeLists.txt
-
- default
-
- # Remove bundled depends that have portage equivalents
- rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,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 ON OFF)
- -DUSE_EXPAT=$(usex expat ON OFF)
- -DUSE_LIBXML=$(usex !expat ON OFF)
- -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/bin/OpenCOLLADAValidator
-}
diff --git a/media-libs/opencollada/opencollada-1.6.31.ebuild b/media-libs/opencollada/opencollada-1.6.31.ebuild
deleted file mode 100644
index a79332a0edf..00000000000
--- a/media-libs/opencollada/opencollada-1.6.31.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-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="expat static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="1.6"
-
-RDEPEND="dev-libs/libpcre
- dev-libs/zziplib
- media-libs/lib3ds
- sys-libs/zlib
- expat? ( dev-libs/expat )
- !expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}"/OpenCOLLADA-${PV}
-# This is needed or you get an error on install
-BUILD_DIR="${S}"/build
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0_p864-expat.patch
- "${FILESDIR}"/${PN}-1.2.2-soversion.patch
- "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
- "${FILESDIR}"/${PN}-1.2.2-libdir.patch
-)
-
-src_prepare() {
- edos2unix CMakeLists.txt
-
- default
-
- # Remove bundled depends that have portage equivalents
- rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,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 ON OFF)
- -DUSE_EXPAT=$(usex expat ON OFF)
- -DUSE_LIBXML=$(usex !expat ON OFF)
- -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/bin/OpenCOLLADAValidator
-}
diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
deleted file mode 100644
index 8389c5d0edd..00000000000
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic 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-v1.patch )
-
-src_prepare() {
- edos2unix CMakeLists.txt
-
- cmake-utils_src_prepare
-
- # Remove bundled depends that have portage equivalents
- rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,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
- -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/OpenCOLLADAValidator"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/
@ 2018-08-07 12:20 Jonathan Scruggs
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Scruggs @ 2018-08-07 12:20 UTC (permalink / raw
To: gentoo-commits
commit: e8961458ced3f2550e8272124f8a521ed6070a68
Author: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 12:19:06 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 12:19:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8961458
media-libs/opencollada: version bump to 1.6.63
Added patch for future libpcre versions.
Package-Manager: Portage-2.3.44, Repoman-2.3.10
media-libs/opencollada/Manifest | 1 +
.../files/opencollada-1.6.63-pcre-fix.patch | 14 +++++
media-libs/opencollada/opencollada-1.6.63.ebuild | 73 ++++++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 9bf5a7379e3..9fa5fa9dfa6 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,2 +1,3 @@
DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
+DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
diff --git a/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch
new file mode 100644
index 00000000000..2d4077446de
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch
@@ -0,0 +1,14 @@
+diff -purN a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-07-19 01:10:56.000000000 +0100
++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-08-07 12:12:59.209871432 +0100
+@@ -12,9 +12,7 @@
+ #define __COLLADABU_PCRECOMPILEDPATTERN_H__
+
+ #include "COLLADABUPrerequisites.h"
+-
+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include <pcre.h>
+
+
+ namespace COLLADABU
diff --git a/media-libs/opencollada/opencollada-1.6.63.ebuild b/media-libs/opencollada/opencollada-1.6.63.ebuild
new file mode 100644
index 00000000000..ad9d4681dfa
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.63.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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
+ media-libs/lib3ds
+ 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"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-07 12:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-10 9:19 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-08-07 12:20 Jonathan Scruggs
2018-01-30 21:00 Jonathan Scruggs
2017-01-15 11:14 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox