[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
commit: b76590f9fb8615da3da9d783ad841c0e3881a27b
Author: Sam James gentoo org>
AuthorDate: Sun Apr 16 10:27:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 23:16:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76590f9
media-libs/opencollada: fix build w/ gcc 13, drop -Werror
Closes: https://bugs.gentoo.org/877335
Closes: https://bugs.gentoo.org/895102
Closes: https://bugs.gentoo.org/899750
Signed-off-by: Sam James gentoo.org>
.../files/opencollada-1.6.68-gcc13.patch | 35 ++
.../files/opencollada-1.6.68-werror.patch | 11 +++
media-libs/opencollada/opencollada-1.6.68.ebuild | 4 ++-
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
new file mode 100644
index ..e12771ca97a4
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/899750
+https://github.com/KhronosGroup/OpenCOLLADA/pull/656
+
+From 84c8c9a02b4e5fe40465034563cb36527e865dac Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Mon, 11 Jul 2022 21:33:11 +0100
+Subject: [PATCH] DAEValidator: fix gcc-13 build
+
+On gcc-13 c++ headers don't include implicitly any more.
+This exposed build failure as:
+
+/build/source/DAEValidator/library/src/XmlDoc.cpp: In member function
'virtual void opencollada::XmlDoc::readFile(const std::string&)':
+/build/source/DAEValidator/library/src/XmlDoc.cpp:59:17: error: 'uint32_t'
was not declared in this scope
+ 59 | uint32_t signature = *reinterpret_cast(content.data());
+ | ^~~~
+--- a/DAEValidator/library/src/DaeValidator.cpp
b/DAEValidator/library/src/DaeValidator.cpp
+@@ -4,6 +4,7 @@
+ #include "Strings.h"
+ #include "StringUtil.h"
+ #include
++#include
+ #include "no_warning_iomanip"
+ #include "no_warning_iostream"
+ #include
+--- a/DAEValidator/library/src/XmlDoc.cpp
b/DAEValidator/library/src/XmlDoc.cpp
+@@ -1,5 +1,6 @@
+ #include "Macros.h"
+
++#include
+ #if IS_GNUC_AND_GNUC_VERSION_LT(5,1,1)
+ #include
+ #endif
+
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
new file mode 100644
index ..3a490d326ddc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
@@ -0,0 +1,11 @@
+--- a/DAEValidator/CMakeLists.txt
b/DAEValidator/CMakeLists.txt
+@@ -100,7 +100,7 @@ if (WIN32)
+ # C4820: 'bytes' bytes padding added after construct 'member_name'
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514
/wd4592 /wd4710 /wd4711 /wd4820")
+ else ()
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+ endif ()
+
+ add_custom_command(
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild
b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 49f53f567c18..d11bbc826b9f 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-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,6 +33,8 @@ PATCHES=(
"${FILESDIR}/${P}-fix-null-conversion.patch"
"${FILESDIR}/${P}-cmake-fixes.patch"
"${FILESDIR}/${PN}-1.6.63-pcre-fix.patch"
+ "${FILESDIR}/${PN}-1.6.68-gcc13.patch"
+ "${FILESDIR}/${PN}-1.6.68-werror.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
commit: e7bfacad23ebcfdcdbd1d4b2b2c23bdef2a3e071
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 28 16:34:51 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 28 16:50:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7bfacad
media-libs/opencollada: Drop 1.6.63-r1
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/opencollada/Manifest| 1 -
.../files/opencollada-1.6.62-cmake-fixes.patch | 122 -
.../opencollada/opencollada-1.6.63-r1.ebuild | 72
3 files changed, 195 deletions(-)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index b273d534738..a06cbc7d024 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,2 +1 @@
-DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B
dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17
SHA512
e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B
45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2
SHA512
1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
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 8fc32784daa..000
--- 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 +
-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
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
commit: 7a27bb13eaf1d39055d2ec2b82377ee4b3e1a000
Author: Adrian Grigo yahoo com au>
AuthorDate: Fri May 8 20:05:38 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jun 17 17:00:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a27bb13
media-libs/opencollada: Version bump to 1.6.68
Version bump to 1.6.68 as required by blender-2.82a.
The ebuild has been updated to EAPI 7.
The null conversion QA error was fixed by initialising std::vector with
zero. I resolved the insecure DAEValidator RUNPATH QA error by clearing
the path with app-admin/chrpath and installing its library
libDAEValidatorLibrary.so
Signed-off-by: Adrian Grigo yahoo.com.au>
Closes: https://bugs.gentoo.org/721682
Closes: https://github.com/gentoo/gentoo/pull/15717
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/opencollada/Manifest| 1 +
.../files/opencollada-1.6.68-cmake-fixes.patch | 122 +
.../opencollada-1.6.68-fix-null-conversion.patch | 12 ++
media-libs/opencollada/metadata.xml| 9 +-
media-libs/opencollada/opencollada-1.6.68.ebuild | 82 ++
5 files changed, 225 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 36517929a02..b273d534738 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1 +1,2 @@
DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B
dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17
SHA512
e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
+DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B
45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2
SHA512
1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch
b/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch
new file mode 100644
index 000..3d4be8dba1b
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs
+Date: Sat, 13 Jan 2018 11:54:44 +
+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 68)
++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 @@
[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
commit: ee2afb323a09be2b2067896da53b4b5cf747a120
Author: Jonathan Scruggs gmail com>
AuthorDate: Thu Sep 21 09:03:11 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Sep 22 14:48:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2afb32
media-libs/opencollada: version bump to 1.6.58.
* Updated the build fixes patch.
Signed-off by: Jonathan Scruggs gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/5749
media-libs/opencollada/Manifest| 1 +
.../files/opencollada-build-fixes-v3.patch | 58 ++
media-libs/opencollada/opencollada-1.6.36.ebuild | 4 +-
...ada-1.6.36.ebuild => opencollada-1.6.58.ebuild} | 18 ---
4 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index acaa1754892..d4db147f60b 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -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
diff --git a/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
new file mode 100644
index 000..a0e055dfc35
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
@@ -0,0 +1,58 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2017-01-07 18:10:57.214728093 +
b/CMakeLists.txt 2017-01-07 18:11:06.322736320 +
+@@ -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)
