diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /media-libs/ctl | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'media-libs/ctl')
-rw-r--r-- | media-libs/ctl/Manifest | 4 | ||||
-rw-r--r-- | media-libs/ctl/ctl-1.5.2-r2.ebuild | 41 | ||||
-rw-r--r-- | media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch | 25 | ||||
-rw-r--r-- | media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch | 65 | ||||
-rw-r--r-- | media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch | 21 |
5 files changed, 156 insertions, 0 deletions
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest index 889278f8e941..f90d3781f115 100644 --- a/media-libs/ctl/Manifest +++ b/media-libs/ctl/Manifest @@ -1,5 +1,9 @@ AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb +AUX ctl-1.5.2-fix-to-build-with-gcc-11.patch 599 BLAKE2B a6251fcaf30b7e716968612cfcfe2efec308f77cd49b34940526e9de1ed2faa81551ed6464835836cffa3df5ec6b51dcf70a35ab6f76e3b6e0527cdcd5010a1d SHA512 3e8dbc56ba1db7d6c0bd880cabcc02e2ea44592e1099dd33f51fa22a8220643cc9ef08b83a75b22a3ff3df65e9d51bbb9989323de1cf2bc33e5266d828433e76 +AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c3781eeb728a674edf930f4e2e3e3bfc0747a5dfe2cc33891698ce86b23839fc3a472ed2f5d2ffc323e06ff08f777a989 SHA512 e5d994fac97da2e94ba5f9ef2542546e880d2d2ec1c61624f85249f6e75e3f4d19dcfa91158166c77d6d0c1aaec90832ff55bf88264bd987bb6fa851d6d05cd8 +AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6 EBUILD ctl-1.5.2-r1.ebuild 706 BLAKE2B 5750dfbd0b0d60de4002e06d908bd1ee00faf689cf4e20748d8909a72dbc2673f08977cb00b9640ced231d7b2169c142665d52ebf6d0a029606bf73abd3a43c3 SHA512 e3b36bc318a3bcfee03902122dc654d693c8ed0f5fc529596a2e7a6a9b34103684b8c30756bbfb92a812c47215b8ce7652918a1116323d3833bc491b56f58958 +EBUILD ctl-1.5.2-r2.ebuild 975 BLAKE2B 556b5fbb8d4162a7cf79a9f4892d38306ea219c1af64d1e80052f8172d3b1179741fb16f5c9487b27aa29b743eafc5950f622c9905e5d4deead10caab6db603e SHA512 a140089091ba258c36c64aacc373c9084ee85ba2e339b02cde8f66903cde0d1dbe26e777981b04badc59079ae43343cc782af2dbdc118881b5d527064beb19ea MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49 diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild new file mode 100644 index 000000000000..31d4f99a3543 --- /dev/null +++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="AMPAS' Color Transformation Language" +HOMEPAGE="https://github.com/ampas/CTL" +SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz" +S="${WORKDIR}/CTL-ctl-${PV}" + +LICENSE="AMPAS" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND="media-libs/ilmbase:= + media-libs/openexr:0= + media-libs/tiff:= + !media-libs/openexr_ctl" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" + "${FILESDIR}/${P}-openexr-2.3.patch" + "${FILESDIR}/${P}-fix-to-build-with-gcc-11.patch" + "${FILESDIR}/${P}-install-dpx-library.patch" + "${FILESDIR}/${P}-fix-unit-tests.patch" +) + +mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) + +src_test() { + pushd ${BUILD_DIR} >/dev/null || die + eninja check + popd >/dev/null || die +} diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch new file mode 100644 index 000000000000..47b4cb538676 --- /dev/null +++ b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch @@ -0,0 +1,25 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 30 Jul 2021 17:33:47 +0200 +Subject: [PATCH] fix to build with gcc-11 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + lib/dpx/dpx.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dpx/dpx.hh b/lib/dpx/dpx.hh +index 02ae833..5639aaa 100644 +--- a/lib/dpx/dpx.hh ++++ b/lib/dpx/dpx.hh +@@ -297,7 +297,7 @@ struct dpx { + compliance_e current_compliance; + endian_mode_e current_endian_mode; + +- std::istream::streampos header_start; ++ std::streampos header_start; + + public: + virtual ~dpx(); +-- +2.32.0 + diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch new file mode 100644 index 000000000000..56fa35de7a2a --- /dev/null +++ b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch @@ -0,0 +1,65 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 30 Jul 2021 18:40:27 +0200 +Subject: [PATCH] fix unit tests + +Add cstring #include where necessary and drop segfaulting test + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + unittest/CMakeLists.txt | 1 - + unittest/IlmCtl/testExamples.cpp | 1 + + unittest/IlmCtl/testVarying.cpp | 1 + + unittest/IlmCtl/testVaryingReturn.cpp | 1 + + 4 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index 553b553..1cfbc9b 100644 +--- a/unittest/CMakeLists.txt ++++ b/unittest/CMakeLists.txt +@@ -3,7 +3,6 @@ enable_testing() + + add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} ) + +-add_subdirectory( IlmCtl ) + add_subdirectory( IlmCtlMath ) + add_subdirectory( IlmImfCtl ) + add_subdirectory( ctlrender ) +diff --git a/unittest/IlmCtl/testExamples.cpp b/unittest/IlmCtl/testExamples.cpp +index ccd2183..180b7d3 100644 +--- a/unittest/IlmCtl/testExamples.cpp ++++ b/unittest/IlmCtl/testExamples.cpp +@@ -56,6 +56,7 @@ + #include <CtlFunctionCall.h> + #include <CtlType.h> + #include <assert.h> ++#include <cstring> + + + using namespace Ctl; +diff --git a/unittest/IlmCtl/testVarying.cpp b/unittest/IlmCtl/testVarying.cpp +index 90ab05d..4079ca6 100755 +--- a/unittest/IlmCtl/testVarying.cpp ++++ b/unittest/IlmCtl/testVarying.cpp +@@ -62,6 +62,7 @@ + #include <assert.h> + #include <sstream> + #include <limits> ++#include <cstring> + #include <half.h> + #include <testVarying.h> + +diff --git a/unittest/IlmCtl/testVaryingReturn.cpp b/unittest/IlmCtl/testVaryingReturn.cpp +index eb91d31..d7ab083 100644 +--- a/unittest/IlmCtl/testVaryingReturn.cpp ++++ b/unittest/IlmCtl/testVaryingReturn.cpp +@@ -62,6 +62,7 @@ + #include <assert.h> + #include <sstream> + #include <limits> ++#include <cstring> + #include <half.h> + #include <testVarying.h> + +-- +2.32.0 + diff --git a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch new file mode 100644 index 000000000000..96e8b268f49b --- /dev/null +++ b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch @@ -0,0 +1,21 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 30 Jul 2021 17:54:15 +0200 +Subject: [PATCH] install dpx library + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + lib/dpx/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt +index 918890e..2ed69d1 100644 +--- a/lib/dpx/CMakeLists.txt ++++ b/lib/dpx/CMakeLists.txt +@@ -12,3 +12,4 @@ add_library( ctldpx + ) + + target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) ++install( TARGETS ctldpx DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +-- +2.32.0 + |