dilfridge 15/02/08 00:19:57
Added: opencollada-1.2.2-no-undefined.patch
opencollada-1.2.2-libdir.patch
opencollada-1.2.2-soversion.patch
Log:
Version bump and live ebuild, based on work by Andreas Sturmlechner, bug
486018
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
EBE6A336BE19039C!)
Revision Changes Path
1.1
media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch?rev=1.1&content-type=text/plain
Index: opencollada-1.2.2-no-undefined.patch
===================================================================
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)
1.1 media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch?rev=1.1&content-type=text/plain
Index: opencollada-1.2.2-libdir.patch
===================================================================
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)
#-----------------------------------------------------------------------------
1.1
media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch?rev=1.1&content-type=text/plain
Index: opencollada-1.2.2-soversion.patch
===================================================================
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)
