| 1 |
dilfridge 15/02/08 00:19:57 |
| 2 |
|
| 3 |
Added: opencollada-1.2.2-no-undefined.patch |
| 4 |
opencollada-1.2.2-libdir.patch |
| 5 |
opencollada-1.2.2-soversion.patch |
| 6 |
Log: |
| 7 |
Version bump and live ebuild, based on work by Andreas Sturmlechner, bug 486018 |
| 8 |
|
| 9 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch |
| 13 |
|
| 14 |
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 |
| 15 |
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 |
| 16 |
|
| 17 |
Index: opencollada-1.2.2-no-undefined.patch |
| 18 |
=================================================================== |
| 19 |
Source: https://build.opensuse.org/package/show/graphics/openCOLLADA |
| 20 |
|
| 21 |
Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt |
| 22 |
=================================================================== |
| 23 |
--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt |
| 24 |
+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt |
| 25 |
@@ -28,7 +28,10 @@ set(SRC |
| 26 |
include/performanceTest/performanceTest.h |
| 27 |
) |
| 28 |
|
| 29 |
-set(TARGET_LIBS ftoa) |
| 30 |
+set(TARGET_LIBS |
| 31 |
+ ftoa |
| 32 |
+ UTF |
| 33 |
+) |
| 34 |
|
| 35 |
include_directories( |
| 36 |
${libBuffer_include_dirs} |
| 37 |
Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt |
| 38 |
=================================================================== |
| 39 |
--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt |
| 40 |
+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt |
| 41 |
@@ -244,10 +244,10 @@ else () # if pcre not found building it |
| 42 |
endif () |
| 43 |
|
| 44 |
# building required libs |
| 45 |
+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) |
| 46 |
+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) |
| 47 |
add_subdirectory(common/libftoa) |
| 48 |
add_subdirectory(common/libBuffer) |
| 49 |
-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) |
| 50 |
-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) |
| 51 |
|
| 52 |
# building OpenCOLLADA libs |
| 53 |
add_subdirectory(COLLADABaseUtils) |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 media-libs/opencollada/files/opencollada-1.2.2-libdir.patch |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch?rev=1.1&view=markup |
| 60 |
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 |
| 61 |
|
| 62 |
Index: opencollada-1.2.2-libdir.patch |
| 63 |
=================================================================== |
| 64 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 65 |
index 96ccb32..c2673f0 100644 |
| 66 |
--- a/CMakeLists.txt |
| 67 |
+++ b/CMakeLists.txt |
| 68 |
@@ -146,6 +146,9 @@ set(OPENCOLLADA_VERSION_MINOR 1) |
| 69 |
set(OPENCOLLADA_VERSION_PATCH 0) |
| 70 |
set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH}) |
| 71 |
|
| 72 |
+#----------------------------------------------------------------------------- |
| 73 |
+# Generic install paths |
| 74 |
+include(GNUInstallDirs) |
| 75 |
|
| 76 |
#----------------------------------------------------------------------------- |
| 77 |
# Compiler warnings. |
| 78 |
@@ -178,9 +181,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}") |
| 79 |
#----------------------------------------------------------------------------- |
| 80 |
# Install vars |
| 81 |
|
| 82 |
-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada) |
| 83 |
-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada) |
| 84 |
-set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake) |
| 85 |
+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada) |
| 86 |
+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada) |
| 87 |
+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake) |
| 88 |
|
| 89 |
|
| 90 |
#----------------------------------------------------------------------------- |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.1 media-libs/opencollada/files/opencollada-1.2.2-soversion.patch |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch?rev=1.1&view=markup |
| 97 |
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 |
| 98 |
|
| 99 |
Index: opencollada-1.2.2-soversion.patch |
| 100 |
=================================================================== |
| 101 |
Source: |
| 102 |
https://build.opensuse.org/package/show/graphics/openCOLLADA |
| 103 |
|
| 104 |
diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt |
| 105 |
--- OpenCOLLADA.orig/CMakeLists.txt 2013-08-10 02:00:51.000000000 -0500 |
| 106 |
+++ OpenCOLLADA/CMakeLists.txt 2013-08-28 10:34:50.122102989 -0500 |
| 107 |
@@ -77,7 +77,7 @@ |
| 108 |
message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") |
| 109 |
endif () |
| 110 |
add_library(${name}_shared SHARED ${sources}) |
| 111 |
- set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name}) |
| 112 |
+ set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) |
| 113 |
foreach(target_lib ${target_libs}) |
| 114 |
if(TARGET ${target_lib}_shared) |
| 115 |
target_link_libraries(${name}_shared ${target_lib}_shared) |
Archives