commit OpenColorIO for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenColorIO for openSUSE:Factory checked in at 2023-09-01 14:19:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenColorIO (Old) and /work/SRC/openSUSE:Factory/.OpenColorIO.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenColorIO" Fri Sep 1 14:19:47 2023 rev:19 rq:1108341 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO.changes 2023-06-04 00:13:11.293744093 +0200 +++ /work/SRC/openSUSE:Factory/.OpenColorIO.new.1766/OpenColorIO.changes 2023-09-01 14:20:43.479473786 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 09:45:47 UTC 2023 - Christophe Marin <christophe@krop.fr> + +- Add patch: + * 0001-Fix-detection-of-yaml-cpp-0.8.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-detection-of-yaml-cpp-0.8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenColorIO.spec ++++++ --- /var/tmp/diff_new_pack.1MNF3o/_old 2023-09-01 14:20:44.587513333 +0200 +++ /var/tmp/diff_new_pack.1MNF3o/_new 2023-09-01 14:20:44.591513475 +0200 @@ -41,6 +41,8 @@ Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}.tar.gz # PATCH-FIX-UPSTREAM gcc12_fix.patch asterios.dramis@gmail.com -- Fix compilation with GCC12 Patch0: gcc12_fix.patch +# PATCH-FIX-OPENSUSE 0001-Fix-detection-of-yaml-cpp-0.8.patch -- temporary solution to detect yaml-cpp 0.8 +Patch1: 0001-Fix-detection-of-yaml-cpp-0.8.patch BuildRequires: cmake >= 3.12 BuildRequires: doxygen BuildRequires: gcc-c++ @@ -124,8 +126,7 @@ This package contains python bindings for OpenColorIO. %prep -%setup -q -n %{pkg_name}-%{version} -%patch0 -p1 +%autosetup -p1 -n %{pkg_name}-%{version} # Fix library install location sed -i 's|DESTINATION lib|DESTINATION %{_lib}|' src/OpenColorIO/CMakeLists.txt ++++++ 0001-Fix-detection-of-yaml-cpp-0.8.patch ++++++ From 9f0e7d4a262b7cc2922d7dcb63f35b5580fa0f90 Mon Sep 17 00:00:00 2001 From: Christophe Marin <christophe@krop.fr> Date: Wed, 30 Aug 2023 11:43:30 +0200 Subject: [PATCH] Fix detection of yaml-cpp 0.8 yaml-cpp 0.8 changed their CMake target name. As Findyaml-cpp.cmake also tries to get variables from the pkgconfig file, we don't need the cmake target. --- share/cmake/modules/Findyaml-cpp.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/share/cmake/modules/Findyaml-cpp.cmake b/share/cmake/modules/Findyaml-cpp.cmake index 1dd8105..57d5e5c 100644 --- a/share/cmake/modules/Findyaml-cpp.cmake +++ b/share/cmake/modules/Findyaml-cpp.cmake @@ -28,11 +28,6 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL) set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY) - if(NOT DEFINED yaml-cpp_ROOT) - # Search for yaml-cpp-config.cmake - find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET) - endif() - if(yaml-cpp_FOUND) get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION) else() -- 2.41.0
participants (1)
-
Source-Sync