From d414c993cafd9e31a370c4a5aae042c710df2419 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Jan 2023 14:51:38 +0000 Subject: gentoo auto-resync : 28:01:2023 - 14:51:38 --- media-libs/Manifest.gz | Bin 68076 -> 68080 bytes media-libs/avidemux-core/Manifest | 2 - .../avidemux-core/avidemux-core-2.7.8.ebuild | 98 ----- media-libs/avidemux-plugins/Manifest | 3 - .../avidemux-plugins/avidemux-plugins-2.7.8.ebuild | 164 --------- .../avidemux-plugins-2.6.20-optional-pulse.patch | 20 -- media-libs/ctl/Manifest | 9 +- media-libs/ctl/ctl-1.5.2-r4.ebuild | 39 -- media-libs/ctl/ctl-1.5.2_p20221224.ebuild | 4 +- ...-GNUInstallDirs-and-fix-PkgConfig-files-1.patch | 399 --------------------- .../files/ctl-1.5.2-fix-to-build-with-gcc-11.patch | 25 -- .../ctl/files/ctl-1.5.2-fix-unit-tests.patch | 65 ---- .../ctl/files/ctl-1.5.2-install-dpx-library.patch | 21 -- media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch | 13 - media-libs/openexr/Manifest | 4 - ....2-0001-IlmImfTest-main.cpp-disable-tests.patch | 40 --- ...xr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 - media-libs/openexr/openexr-2.5.8.ebuild | 70 ---- media-libs/zita-alsa-pcmi/Manifest | 2 +- .../zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild | 4 +- 20 files changed, 6 insertions(+), 989 deletions(-) delete mode 100644 media-libs/avidemux-core/avidemux-core-2.7.8.ebuild delete mode 100644 media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild delete mode 100644 media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch delete mode 100644 media-libs/ctl/ctl-1.5.2-r4.ebuild delete mode 100644 media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch delete mode 100644 media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch delete mode 100644 media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch delete mode 100644 media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch delete mode 100644 media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch delete mode 100644 media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch delete mode 100644 media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch delete mode 100644 media-libs/openexr/openexr-2.5.8.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index d2010b53591d..b24d1bc8e509 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 0a7344cb3d5a..66b7125ba34c 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,6 +1,4 @@ AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2 -DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3 -EBUILD avidemux-core-2.7.8.ebuild 2543 BLAKE2B f3cd069695b889965b17e49a4b27558ad4ab2192d93ecdb1389fd6ce817eefd85e66b1ea52179a6c99e9e0c71e5d88625220a25ddec7d0a38b38649dc090e8c3 SHA512 9d134fd799e3d725bc0c5e24350513ca44df1b6662ed4075169e5e6f3a8eb2dda695970e232d26f1f7762a08f2872a13cf6786214d81b1f759f28b41b6c475de EBUILD avidemux-core-2.8.1-r1.ebuild 2645 BLAKE2B b655685a9f40e0c20548a9a6ed469fbc8ccbd486351c119ed39d5dfea918d7773aa58439b5b138c0346c8aece9a290a2f6be6f13758c59d8d390f6bf72cd6bb4 SHA512 61555c094b8aa32ad1e45988f9ddeb74c88779ac40b36bf3b420b67b857b2d985f97e0378e0d2804bf207c3a2a5168f17a41c2a760a6812e631ec36fc0112858 MISC metadata.xml 445 BLAKE2B e50f517d52c143a715503c3f235371a7e03de54e6eba1da6eac8101cdf28392247ed4fd80c2abc51639394c5883b9c123810597ac9499bba0760ed34ebb0013a SHA512 414df3edeaa635e37cbab1a7de5edb214f258e16f89bb32f5d820474017e54f2f3eab48929e505ea9fa8b6aca1f7e608cc558ca6147e605272c2fe644798597b diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild deleted file mode 100644 index 062fa0231f9c..000000000000 --- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake flag-o-matic toolchain-funcs - -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/avidemux" -SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.7" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - dev-db/sqlite:3 - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) - vaapi? ( media-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND=" - ${DEPEND} - !/dev/null || die - eninja check - popd >/dev/null || die -} diff --git a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild index 472fe1e2845f..fe8ff0e39185 100644 --- a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild +++ b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/CTL-${MY_COMMIT}" LICENSE="AMPAS" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ia64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch deleted file mode 100644 index e4fadf1aa05c..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch +++ /dev/null @@ -1,399 +0,0 @@ -From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs -Date: Mon, 25 Sep 2017 17:41:26 +0100 -Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files - -* GNUInstallDirs are variables set by each distro and OS, so we - don't need to define them manually. They can also be set manually - during the configure phase. The code to define custom directories can - be removed and replaced with the equivalent GNUInstallDirs variable. -* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully - utilized everywhere. This makes Pkg-Config a hard dependency so that - the libraries and directories can be found easily. This will use the - correct libraries no matter how they are named, so this is compatible - with both pre-2.0 and post 2.0 naming schemes. -* The Pkg-Config files had several errors that are now fixed. - -Upstream PR: https://github.com/ampas/CTL/pull/67 ---- - CMakeLists.txt | 36 ++++++++--------------------- - OpenEXR_CTL/CMakeLists.txt | 2 +- - OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- - OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- - OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- - config/CTL.pc.in | 8 +++---- - config/OpenEXR_CTL.pc.in | 15 ++++++------- - configure.cmake | 41 ++++++++++++++++------------------ - ctlrender/CMakeLists.txt | 20 ++++++++--------- - doc/CMakeLists.txt | 2 +- - lib/IlmCtl/CMakeLists.txt | 4 ++-- - lib/IlmCtlMath/CMakeLists.txt | 4 ++-- - lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- - lib/IlmImfCtl/CMakeLists.txt | 6 ++--- - lib/dpx/CMakeLists.txt | 1 + - 15 files changed, 66 insertions(+), 89 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 01f622c..35e9a48 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,22 +1,14 @@ - cmake_minimum_required(VERSION 2.8) - project( CTL ) - -+INCLUDE ( GNUInstallDirs ) -+ - set( CTL_MAJOR_VERSION 1 ) - set( CTL_MINOR_VERSION 5 ) --set( CTL_PATCH_VERSION 0 ) -+set( CTL_PATCH_VERSION 2 ) - set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) - --## Make install directories overrideable --set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) --set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) --set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) --set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) --if( WIN32 AND NOT CYGWIN ) -- set(DEF_INSTALL_CMAKE_DIR CMake) --else() -- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) --endif() --set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) -+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" ) - - # use, i.e. don't skip the full RPATH for the build tree - SET(CMAKE_SKIP_BUILD_RPATH FALSE) -@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - # which point to directories outside the build tree to the install RPATH - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - # the RPATH to be used when installing, but only if it's not a system directory --LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) -+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) - IF("${isSystemDir}" STREQUAL "-1") -- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") - ENDIF("${isSystemDir}" STREQUAL "-1") - -- --## convert install paths to absolute --foreach( p LIB BIN INCLUDE CMAKE DOC) -- set( var INSTALL_${p}_DIR ) -- if( NOT IS_ABSOLUTE "${${var}}" ) -- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) -- endif() --endforeach() -- - option(ENABLE_SHARED "Enable Shared Libraries" ON) - - if ( ENABLE_SHARED ) -@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr - export(PACKAGE CTL) - - # Create a CTLBuildTreeSettings.cmake file for the use from the build tree --file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") -+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) - configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) - configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) - - if ( PKG_CONFIG_FOUND ) - configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) --install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) -+install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) - endif() - - install( FILES - "${PROJECT_BINARY_DIR}/CTLConfig.cmake" - "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" -+ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) --install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION -- "${INSTALL_CMAKE_DIR}" COMPONENT dev) - -diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt -index c1ca53e..3f19dd4 100644 ---- a/OpenEXR_CTL/CMakeLists.txt -+++ b/OpenEXR_CTL/CMakeLists.txt -@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) - - if ( PKG_CONFIG_FOUND ) - configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) --install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) -+install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) - endif() - - # TODO CMake config -diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt -index c63c22e..9c9e5b8 100644 ---- a/OpenEXR_CTL/CtlModules/CMakeLists.txt -+++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt -@@ -2,6 +2,6 @@ install( - FILES - utilities.ctl - DESTINATION -- ${INSTALL_LIB_DIR}/CTL -+ ${CMAKE_INSTALL_LIBDIR}/CTL - ) - -diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -index e396ec5..1f0eea0 100644 ---- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -+++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) - target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) - target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) - --install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) -+install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) - --install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) -+install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) -diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt -index 50bd116..d9eadd8 100644 ---- a/OpenEXR_CTL/exrdpx/CMakeLists.txt -+++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt -@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) - target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) - target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) - --install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) -+install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) - --install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) -+install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) - - -diff --git a/config/CTL.pc.in b/config/CTL.pc.in -index 6d6e732..9b212a4 100644 ---- a/config/CTL.pc.in -+++ b/config/CTL.pc.in -@@ -1,8 +1,6 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@INSTALL_BIN_DIR@ --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INCLUDE_DIR@ --CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL - - Name: CTL - Description: CTL interpreter library -diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in -index 4cef5c6..39a1a3f 100644 ---- a/config/OpenEXR_CTL.pc.in -+++ b/config/OpenEXR_CTL.pc.in -@@ -1,11 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ --OpenEXR_includedir=@includedir@/OpenEXR -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR - - Name: OpenEXR_CTL - Description: Simplified OpenEXR interface to CTL --Version: @OPENEXR_CTL_VERSION@ --Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ --Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} -+Version: @CTL_VERSION@ -+Libs: -L${libdir} -lIlmImfCtl -+Cflags: -I${OpenEXR_includedir} -+Requires: CTL,OpenEXR -diff --git a/configure.cmake b/configure.cmake -index 1817071..eb7e14e 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -1,10 +1,7 @@ --# Until we get some of these modules into the upstream packages, put them here --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") -+# Make Pkg-Config required. -+find_package( PkgConfig ) - --find_package( PkgConfig QUIET ) -- --find_package( IlmBase QUIET ) -+PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) - if(IlmBase_FOUND) - message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) - ### -@@ -13,11 +10,11 @@ if(IlmBase_FOUND) - ### - include_directories( ${IlmBase_INCLUDE_DIRS} ) - link_directories( ${IlmBase_LIBRARY_DIRS} ) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) -+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) - else() - message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) - endif() -@@ -39,20 +36,20 @@ else() - endif() - endif() - --find_package( OpenEXR QUIET ) -+PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) - if (OpenEXR_FOUND) - message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) - else() - message( WARNING "Unable to find OpenEXR libraries, disabling" ) - endif() - --find_package( AcesContainer ) --if (AcesContainer_FOUND) -- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) --else() -- if ( PKG_CONFIG_FOUND ) -- pkg_check_modules( AcesContainer AcesContainer ) -- else() -- message( WARNING "Unable to find AcesContainer libraries, disabling" ) -- endif() --endif() -+find_package( AcesContainer ) -+ if (AcesContainer_FOUND) -+ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) -+ else() -+ if ( PKG_CONFIG_FOUND ) -+ pkg_check_modules( AcesContainer AcesContainer ) -+ else() -+ message( WARNING "Unable to find AcesContainer libraries, disabling" ) -+ endif() -+ endif() -diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt -index 9fced14..d97093d 100644 ---- a/ctlrender/CMakeLists.txt -+++ b/ctlrender/CMakeLists.txt -@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) - link_directories( ${OpenEXR_LIBRARY_DIRS} ) - endif() - --if ( AcesContainer_FOUND ) --add_definitions( -DHAVE_ACESFILE=1 ) --include_directories( ${AcesContainer_INCLUDE_DIRS} ) --link_directories( ${AcesContainer_LIBRARY_DIRS} ) --endif() -- -+if ( AcesContainer_FOUND ) -+add_definitions( -DHAVE_ACESFILE=1 ) -+include_directories( ${AcesContainer_INCLUDE_DIRS} ) -+link_directories( ${AcesContainer_LIBRARY_DIRS} ) -+endif() -+ - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" ) - - add_executable( ctlrender -@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) - target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) - target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) - endif() --if (AcesContainer_FOUND) --target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) --target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) -+if (AcesContainer_FOUND) -+target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) -+target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) - endif() - --install( TARGETS ctlrender DESTINATION bin ) -+install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 0b123d0..9776205 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1 +1 @@ --install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) -+install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) -diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt -index 3672a43..ef301bd 100644 ---- a/lib/IlmCtl/CMakeLists.txt -+++ b/lib/IlmCtl/CMakeLists.txt -@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} - ) - - target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) --target_link_libraries( IlmCtl Iex IlmThread Half ) -+target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) - - set_target_properties( IlmCtl PROPERTIES - VERSION ${CTL_VERSION} -@@ -50,4 +50,4 @@ install( FILES - CtlVersion.h - DESTINATION include/CTL ) - --install( TARGETS IlmCtl DESTINATION lib ) -+install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt -index 96738cf..6997c74 100644 ---- a/lib/IlmCtlMath/CMakeLists.txt -+++ b/lib/IlmCtlMath/CMakeLists.txt -@@ -18,8 +18,8 @@ install( FILES - CtlLookupTable.h - CtlRbfInterpolator.h - CtlSparseMatrix.h -- DESTINATION include/CTL ) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) - --install( TARGETS IlmCtlMath DESTINATION lib ) -+install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) - - # TODO Add Imath and Iex libadd dependency and version info -diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt -index 2ba792a..5eaf87d 100644 ---- a/lib/IlmCtlSimd/CMakeLists.txt -+++ b/lib/IlmCtlSimd/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) - - add_executable( halfExpLogTable halfExpLogTable.cpp ) --target_link_libraries( halfExpLogTable Half ) -+target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) - - add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" - COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" -@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES - SOVERSION ${CTL_VERSION} - ) - --install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) -+install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) - --install( TARGETS IlmCtlSimd DESTINATION lib ) -+install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt -index 47563df..784e27f 100644 ---- a/lib/IlmImfCtl/CMakeLists.txt -+++ b/lib/IlmImfCtl/CMakeLists.txt -@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} - ImfCtlCopyFunctionArg.cpp - ) - --target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) -+target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) - --install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) -+install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) - - export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) - --install( TARGETS IlmImfCtl DESTINATION lib ) -+install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt -index c8be26e..918890e 100644 ---- a/lib/dpx/CMakeLists.txt -+++ b/lib/dpx/CMakeLists.txt -@@ -11,3 +11,4 @@ add_library( ctldpx - dpx_rw.cc - ) - -+target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) 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 deleted file mode 100644 index 47b4cb538676..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Bernd Waibel -Date: Fri, 30 Jul 2021 17:33:47 +0200 -Subject: [PATCH] fix to build with gcc-11 - -Signed-off-by: Bernd Waibel ---- - 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 deleted file mode 100644 index 56fa35de7a2a..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Bernd Waibel -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 ---- - 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 - #include - #include -+#include - - - 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 - #include - #include -+#include - #include - #include - -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 - #include - #include -+#include - #include - #include - --- -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 deleted file mode 100644 index 96e8b268f49b..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Bernd Waibel -Date: Fri, 30 Jul 2021 17:54:15 +0200 -Subject: [PATCH] install dpx library - -Signed-off-by: Bernd Waibel ---- - 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 - diff --git a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch deleted file mode 100644 index ac4ceb3e5487..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp -=================================================================== ---- CTL-ctl-1.5.2.orig/lib/IlmCtlSimd/CtlSimdInst.cpp -+++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp -@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas - REPLACE_EXC - (e, "\n" << - xcontext.fileName() << ":" << -- inst->lineNumber() << ": " << e); -+ inst->lineNumber() << ": " << e.what()); - - throw e; - } diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 31e7b9a59462..46b1500e71f4 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,11 +1,7 @@ -AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857 -AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167 AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f -DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c -EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8 EBUILD openexr-3.1.5-r1.ebuild 2098 BLAKE2B f28d62eb996fa17516d9e88bd982e55fbb35bf37e9bb25cfb80e89876e755fba59e52cd41b1c1964abb53135256c69b0a98b7d82aa6d17e4819cc45501807f64 SHA512 9c72ea6eb157433805e019e3cb8de40634e78eaf7905a168012cee37b6f866b20eae8a3e63cc8066754813a846c91faa2aaa3f2db679543b8a00f32838605deb MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch deleted file mode 100644 index a77705cb5a7d..000000000000 --- a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Fri, 3 Jul 2020 15:34:47 +0200 -Subject: [PATCH] IlmImfTest/main.cpp: disable tests - -Disable testOptimizedInterleavePatterns and testDwaLookup, which -are not working on x86. -For testOptimizedInterleavePatterns, see -https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748 - -Signed-off-by: Bernd Waibel ---- - IlmImfTest/main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp -index 3245fc4..4ab45b1 100644 ---- a/IlmImfTest/main.cpp -+++ b/IlmImfTest/main.cpp -@@ -228,7 +228,7 @@ main (int argc, char *argv[]) - TEST (testExistingStreams, "core"); - TEST (testStandardAttributes, "core"); - TEST (testOptimized, "basic"); -- TEST (testOptimizedInterleavePatterns, "basic"); -+// TEST (testOptimizedInterleavePatterns, "basic"); - TEST (testYca, "basic"); - TEST (testTiledYa, "basic"); - TEST (testNativeFormat, "basic"); -@@ -255,7 +255,7 @@ main (int argc, char *argv[]) - TEST (testDwaCompressorSimd, "basic"); - TEST (testRle, "core"); - TEST (testB44ExpLogTable, "core"); -- TEST (testDwaLookups, "core"); -+// TEST (testDwaLookups, "core"); - - - //#ifdef ENABLE_IMFHUGETEST --- -2.27.0 - diff --git a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch deleted file mode 100644 index ef71bc0e6871..000000000000 --- a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -This consists of A LOT of individual tests and on some hardware -(e.g. the RISC-V board BeagleV Starlight) the default test time-out -of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf -takes almost 4800 s even on an otherwise idle system so let's add a bit -of margin and set the time-out of this test to 1.5 hours. - ---- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000 -+++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000 -@@ -73,3 +73,4 @@ - target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL) - endif() - add_test(NAME OpenEXR.IlmImf COMMAND $) -+set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400) diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild deleted file mode 100644 index fbe8a897d4ff..000000000000 --- a/media-libs/openexr/openexr-2.5.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/OpenEXR" - -LICENSE="BSD" -SLOT="0/25" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples static-libs utils test" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( PATENTS README.md ) - -src_prepare() { - # Fix path for testsuite - sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" - - # disable failing tests on various arches - if use test; then - if use abi_x86_32; then - eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" - fi - - # Technically this doesn't disable anything, it just gives this test time to complete. - # Could probably be applied unconditionally but will leave this to the maintainers. - if use riscv; then - eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch" - fi - fi - - multilib_foreach_abi cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DINSTALL_OPENEXR_DOCS=$(usex doc) - -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) - -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) - -DOPENEXR_BUILD_UTILS=$(usex utils) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - cmake_src_configure -} - -multilib_src_install_all() { - if use doc; then - DOCS+=( doc/*.pdf ) - fi - einstalldocs - - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest index e743398a4536..d7b8029cc0c3 100644 --- a/media-libs/zita-alsa-pcmi/Manifest +++ b/media-libs/zita-alsa-pcmi/Manifest @@ -2,5 +2,5 @@ AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d49638 DIST zita-alsa-pcmi-0.5.1.tar.bz2 21728 BLAKE2B 7ea5980939ebdcb25b88cc15ff10037adbb328128174d6d6ee243dae1be6305d5967c8c53b15ac37739abb168b2fd24ec2349eba82c9452cc178c39e8a204c59 SHA512 afa0751ef4e510bdc2603d52bdb921cbf8b0a8372bdcae77dd9ba5b4790c08a0a510b9a9e2240bd9ee7ce23163125bd44556621bbb9312c8ab5f82780b648c22 DIST zita-alsa-pcmi-0.6.1.tar.bz2 21767 BLAKE2B 15c089131cd859f4686e06383abab5296bacfc88f10fcd323eca99b46455d3387a3505ae6e6ed2bc8cafab0f3612966ad45e796b1eb0ffa211f06876ed1909b7 SHA512 f4f8f4f834f566a2b81fc9f23c49714815b68e4c6c0b840830592a2d80171e6d4538aacfeb2d3f835bd28fec1a5e1f232c97c4dce254f797ce262e5414062cbc EBUILD zita-alsa-pcmi-0.5.1.ebuild 914 BLAKE2B 6528b89f990ec6911b5df9dd194199c451b7151199bbc929e0a5832f7cb264671015cbf473634f71e2d2007b760f035edba19c978da49b3e085de387866ecfda SHA512 b37b85bc756cc94f795dfa0580425e7f004d042bd4184469e119e697f458a9cb67fa4f66e76c67e567fc3b551c5433ffe16d6319a441ff90a10d5bbfbd358e73 -EBUILD zita-alsa-pcmi-0.6.1.ebuild 921 BLAKE2B f38a619aeb14a28542108462cb5794d9f01a857c7aa455bc5282e1b156931a31d1ec3b59f5cf6039cef2c502e3265bd41dc41846fb72dfdcfa83d7e12eb53ac2 SHA512 0134bf9d0f546793a626abe1c0172087d7a72997bcf65d35414e17241e6128195ec3d66c1f23ae742dc390da35182785ef6fffd8c82d20d78e4a2e471f54ab24 +EBUILD zita-alsa-pcmi-0.6.1.ebuild 915 BLAKE2B 264dbf704b382a74dafe68b5ca35ff30d3019089d0dcb27fbdb8fb374b98db1882ade65370ab288ebc412ed4bef155f03868d5d7853f1f265d9d197775d34c2b SHA512 a2c1a36f7522f9f17891f52558573c081e7429aaca6d4ecb13ab8e8d0fa301e3137ce1481bff1b3dd845c5b8a516222ef2ada65e12a196f449784ba33de9ca74 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild index ce677e65f72a..a078c955bbef 100644 --- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild +++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86" IUSE="" CDEPEND="media-libs/alsa-lib" -- cgit v1.2.3