updpkg(main/opencolorio): update to v2.3.1

This commit is contained in:
Ansh Dadwal 2023-12-24 14:34:30 +05:30 committed by Chongyun Lee
parent 13c82c0b7d
commit 5273f591f2
3 changed files with 9 additions and 72 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://opencolorio.org
TERMUX_PKG_DESCRIPTION="A color management framework for visual effects and animation"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.3.0
TERMUX_PKG_VERSION=2.3.1
TERMUX_PKG_SRCURL=https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=32b7be676c110d849a77886d8a409159f0367309b2b2f5dae5aa0c38f42b445a
TERMUX_PKG_SHA256=7196e979a0449ce28afd46a78383476f3b8fc1cc1d3a417192be439ede83437b
TERMUX_PKG_DEPENDS="imath, libc++, libexpat, libminizip-ng, libyaml-cpp, pystring"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-Dpystring_INCLUDE_DIR=$TERMUX_PREFIX/lib
@ -12,3 +12,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
"
# Command-line apps depend on packages in x11 repo (for OpenGL functionality):
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DOCIO_BUILD_APPS=OFF"
termux_step_pre_configure() {
# error: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing]
# also same is used while building apt
CXXFLAGS+=" -Wno-c++11-narrowing"
CXXFLAGS+=" -I$PREFIX/include/pystring"
}

View File

@ -1,59 +0,0 @@
From 1a359e6de85c90db85e25257ee27e779d169529c Mon Sep 17 00:00:00 2001
From: Mark Reid <mindmark@gmail.com>
Date: Fri, 1 Sep 2023 09:07:11 -0700
Subject: [PATCH] Fix support for X86 32-bit
Signed-off-by: Mark Reid <mindmark@gmail.com>
---
CMakeLists.txt | 5 ++++-
src/OpenColorIO/CPUInfo.cpp | 7 +++++++
src/OpenColorIO/CPUInfoConfig.h.in | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 745fd1898..169d4a196 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,8 +180,11 @@ option(OCIO_USE_OIIO_FOR_APPS "Request OIIO to build apps (ociolutimage, ociocon
if (NOT APPLE)
- if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|X86|x86_64|i386|i686)")
+ if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|x86_64|X86|i386|i686)")
# Intel-based architecture (not APPLE)
+ if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(X86|i386|i686)")
+ set(OCIO_ARCH_X86_32 1)
+ endif()
set(OCIO_ARCH_X86 1)
set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_SSE ON)
set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_AVX ON)
diff --git a/src/OpenColorIO/CPUInfo.cpp b/src/OpenColorIO/CPUInfo.cpp
index 7aae56ad9..28fcd9477 100644
--- a/src/OpenColorIO/CPUInfo.cpp
+++ b/src/OpenColorIO/CPUInfo.cpp
@@ -50,6 +50,13 @@ static inline void cpuid(int index, int *data)
{
#if _MSC_VER
__cpuid(data, index);
+#elif OCIO_ARCH_X86_32
+ __asm__ volatile (
+ "mov %%ebx, %%esi \n\t"
+ "cpuid \n\t"
+ "xchg %%ebx, %%esi"
+ : "=a" (data[0]), "=S" (data[1]), "=c" (data[2]), "=d" (data[3])
+ : "0" (index), "2"(0));
#else
__asm__ volatile (
"mov %%rbx, %%rsi \n\t"
diff --git a/src/OpenColorIO/CPUInfoConfig.h.in b/src/OpenColorIO/CPUInfoConfig.h.in
index a94a7bb84..472af56a4 100644
--- a/src/OpenColorIO/CPUInfoConfig.h.in
+++ b/src/OpenColorIO/CPUInfoConfig.h.in
@@ -3,6 +3,7 @@
#cmakedefine01 OCIO_ARCH_X86
+#cmakedefine01 OCIO_ARCH_X86_32
// Relevant only for arm64 architecture.
#if defined(__aarch64__)

View File

@ -1,11 +0,0 @@
--- a/share/cmake/utils/CheckSupportSSE2.cmake
+++ b/share/cmake/utils/CheckSupportSSE2.cmake
@@ -59,7 +59,7 @@
message(STATUS "Performing Test COMPILER_SUPPORTS_SSE2 - Failed")
endif()
-set(CMAKE_REQUIRED_FLAGS "${_cmake_cxx_flags_orig}")
+set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}")
unset(_cmake_cxx_flags_orig)
if(__universal_build)