commit c41eaa3cfd8cab7357473206bebcfd202473a1fa
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri May 24 22:19:59 2024 +0200
- updated to 1.5.3, now supports OpenEXR 3/2
ctl-c++17.patch | 11 ------
ctl-ctlrender.patch | 10 -----
ctl-libdir.patch | 96 ------------------------------------------------
ctl-link.patch | 11 ------
ctl-openexr-update.patch | 11 ------
ctl-pc.patch | 23 ------------
ctl.spec | 49 ++++++++----------------
7 files changed, 16 insertions(+), 195 deletions(-)
---
diff --git a/ctl.spec b/ctl.spec
index 805ba12..62e2caf 100644
--- a/ctl.spec
+++ b/ctl.spec
@@ -1,28 +1,22 @@
Summary: Color Transform Language libraries
Summary(pl.UTF-8): Biblioteki CTL (języka przekształceń kolorów)
Name: ctl
-Version: 1.5.2
-Release: 4
+Version: 1.5.3
+Release: 1
License: BSD + IP clause
Group: Libraries
#Source0Download: https://github.com/ampas/CTL/tags
Source0: https://github.com/ampas/CTL/archive/%{name}-%{version}.tar.gz
-# Source0-md5: 4796bf258d0c66d421c864996482f952
-Patch0: %{name}-libdir.patch
-Patch1: %{name}-ctlrender.patch
-Patch2: %{name}-pc.patch
-Patch3: %{name}-openexr-update.patch
-Patch4: %{name}-c++17.patch
-Patch5: %{name}-link.patch
+# Source0-md5: 63b1b97a0dd4b64161e9d4f50b3f1b0c
URL:
https://www.oscars.org/science-technology/sci-tech-projects/color-transformation-language
-BuildRequires: OpenEXR-devel
+# or ilmbase + OpenEXR 2.x
+BuildRequires: Imath-devel >= 3.0
+BuildRequires: OpenEXR-devel >= 3.0
BuildRequires: aces_container-devel
-BuildRequires: cmake >= 2.8
-BuildRequires: ilmbase-devel >= 2.0.0
-BuildRequires: libstdc++-devel
+BuildRequires: cmake >= 3.12
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtiff-devel
-BuildRequires: pkgconfig
-Requires: ilmbase >= 2.0.0
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -56,8 +50,8 @@ Summary: Header files for CTL library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki CTL
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: ilmbase-devel >= 2.0.0
-Requires: libstdc++-devel
+Requires: OpenEXR-devel >= 3.0
+Requires: libstdc++-devel >= 6:4.7
Obsoletes: ctl-static < 1.5
%description devel
@@ -84,7 +78,7 @@ przekształceń kolorów).
Summary: Header files for IlmInfCtl library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki IlmInfCtl
Group: Development/Libraries
-Requires: OpenEXR-devel
+Requires: OpenEXR-devel >= 3.0
Requires: ctl-devel = %{version}-%{release}
Requires: openexr_ctl = %{version}-%{release}
Obsoletes: openexr_ctl-static < 1.1
@@ -137,7 +131,7 @@ file format in the process.
ctlrender supports OpenEXR, TIFF, DPX, and ACES container file
formats.
-%description -n ctlrender
+%description -n ctlrender -l pl.UTF-8
ctlrender to uruchamiany z linii poleceń program do nakładania
przekształceń CTL na obraz przy użyciu jednego lub więcej skryptów
CTL, potencjalnie także zmieniając w trakcie format pliku.
@@ -146,19 +140,12 @@ ctlrender obsługuje formaty plików OpenEXR, TIFF, DPX
oraz ACES.
%prep
%setup -q -n CTL-%{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
install -d build
cd build
-%cmake .. \
- -DINSTALL_CMAKE_DIR=%{_libdir}/cmake/CTL \
- -DINSTALL_LIB_DIR=%{_libdir}
+%cmake ..
+
%{__make}
%install
@@ -168,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc/CTL
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/CTL/CtlManual.*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -191,8 +178,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libIlmCtlMath.so
%attr(755,root,root) %{_libdir}/libIlmCtlSimd.so
%{_includedir}/CTL
-%{_pkgconfigdir}/CTL.pc
-%{_libdir}/cmake/CTL
%files -n openexr_ctl
%defattr(644,root,root,755)
@@ -201,9 +186,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n openexr_ctl-devel
%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libIlmImfCtl.so
%{_includedir}/OpenEXR/ImfCtlApplyTransforms.h
-%{_pkgconfigdir}/OpenEXR_CTL.pc
%files -n openexr_ctl-progs
%defattr(644,root,root,755)
diff --git a/ctl-c++17.patch b/ctl-c++17.patch
deleted file mode 100644
index 7c0aba8..0000000
--- a/ctl-c++17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CTL-ctl-1.5.2/lib/dpx/dpx.hh.orig 2014-06-03 03:11:24.000000000 +0200
-+++ CTL-ctl-1.5.2/lib/dpx/dpx.hh 2022-02-05 09:54:00.923386506 +0100
-@@ -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();
diff --git a/ctl-ctlrender.patch b/ctl-ctlrender.patch
deleted file mode 100644
index 84095fb..0000000
--- a/ctl-ctlrender.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CTL-ctl-1.5/lib/dpx/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000
+0200
-+++ CTL-ctl-1.5/lib/dpx/CMakeLists.txt 2014-04-06 09:42:18.259636939 +0200
-@@ -1,6 +1,6 @@
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
-
--add_library( ctldpx
-+add_library( ctldpx STATIC
- dpx.cc
- dpx_raw.cc
- dpx_read.cc
diff --git a/ctl-libdir.patch b/ctl-libdir.patch
deleted file mode 100644
index 7138583..0000000
--- a/ctl-libdir.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- CTL-ctl-1.5/lib/IlmImfCtl/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/lib/IlmImfCtl/CMakeLists.txt 2014-04-06 08:31:55.806391615
+0200
-@@ -13,4 +13,4 @@
-
- export( TARGETS IlmImfCtl IlmCtl FILE
"${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" )
-
--install( TARGETS IlmImfCtl DESTINATION lib )
-+install( TARGETS IlmImfCtl DESTINATION lib${LIB_SUFFIX} )
---- CTL-ctl-1.5/lib/IlmCtl/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000
+0200
-+++ CTL-ctl-1.5/lib/IlmCtl/CMakeLists.txt 2014-04-06 08:32:32.226390855
+0200
-@@ -50,4 +50,4 @@
- CtlVersion.h
- DESTINATION include/CTL )
-
--install( TARGETS IlmCtl DESTINATION lib )
-+install( TARGETS IlmCtl DESTINATION lib${LIB_SUFFIX} )
---- CTL-ctl-1.5/lib/IlmCtlMath/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/lib/IlmCtlMath/CMakeLists.txt 2014-04-06 08:32:50.143057151
+0200
-@@ -20,6 +20,6 @@
- CtlSparseMatrix.h
- DESTINATION include/CTL )
-
--install( TARGETS IlmCtlMath DESTINATION lib )
-+install( TARGETS IlmCtlMath DESTINATION lib${LIB_SUFFIX} )
-
- # TODO Add Imath and Iex libadd dependency and version info
---- CTL-ctl-1.5/lib/IlmCtlSimd/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/lib/IlmCtlSimd/CMakeLists.txt 2014-04-06 08:33:07.246390126
+0200
-@@ -42,4 +42,4 @@
-
- install( FILES CtlSimdInterpreter.h DESTINATION include/CTL )
-
--install( TARGETS IlmCtlSimd DESTINATION lib )
-+install( TARGETS IlmCtlSimd DESTINATION lib${LIB_SUFFIX} )
---- CTL-ctl-1.5/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/CMakeLists.txt 2014-04-06 08:35:26.706387222 +0200
-@@ -77,7 +77,7 @@
-
- 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
lib${LIB_SUFFIX}/pkgconfig COMPONENT dev )
- endif()
-
- install( FILES
---- CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt 2014-04-07 03:33:22.116802754
+0200
-@@ -13,7 +13,7 @@
-
- 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
lib${LIB_SUFFIX}/pkgconfig COMPONENT dev )
- endif()
-
- # TODO CMake config
---- CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp 2014-04-07 17:43:14.157354004
+0200
-@@ -128,8 +128,7 @@
- #if defined (WIN32) || defined (WIN64)
- path = "."; // default windows install location?
- #else
-- path = ".:/usr/local/lib/CTL:/usr/local/" PACKAGE
-- "-" VERSION "/lib/CTL";
-+ path = ".:/usr/share/CTL";
- #endif
-
- size_t pos = 0;
---- CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt 2014-04-07
17:47:19.351452055 +0200
-@@ -2,6 +2,6 @@
- FILES
- utilities.ctl
- DESTINATION
-- ${INSTALL_LIB_DIR}/CTL
-+ share/CTL
- )
-
---- CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt 2014-04-07
17:47:40.999069082 +0200
-@@ -22,4 +22,4 @@
-
- install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
-
--install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
-+install( FILES change_saturation.ctl DESTINATION share/CTL )
---- CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
-+++ CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt 2014-04-07
17:48:14.727216452 +0200
-@@ -22,6 +22,6 @@
-
- install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
-
--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
share/CTL )
-
-
diff --git a/ctl-link.patch b/ctl-link.patch
deleted file mode 100644
index 7374e96..0000000
--- a/ctl-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CTL-ctl-1.5.2/lib/IlmCtlMath/CMakeLists.txt.orig 2023-03-14
18:23:20.790979681 +0100
-+++ CTL-ctl-1.5.2/lib/IlmCtlMath/CMakeLists.txt 2023-03-14
18:44:50.993990051 +0100
-@@ -6,7 +6,7 @@ add_library( IlmCtlMath ${DO_SHARED}
- CtlRbfInterpolator.cpp
- )
-
--target_link_libraries( IlmCtlMath IlmCtl )
-+target_link_libraries( IlmCtlMath IlmCtl Imath )
-
- set_target_properties( IlmCtlMath PROPERTIES
- VERSION ${CTL_VERSION}
diff --git a/ctl-openexr-update.patch b/ctl-openexr-update.patch
deleted file mode 100644
index 007c05d..0000000
--- a/ctl-openexr-update.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp.orig 2014-06-03
03:11:24.000000000 +0200
-+++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp 2022-02-05
08:36:14.965330834 +0100
-@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas
- REPLACE_EXC
- (e, "\n" <<
- xcontext.fileName() << ":" <<
-- inst->lineNumber() << ": " << e);
-+ inst->lineNumber() << ": " << e.message());
-
- throw e;
- }
diff --git a/ctl-pc.patch b/ctl-pc.patch
deleted file mode 100644
index e0eecdf..0000000
--- a/ctl-pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- CTL-ctl-1.5/config/OpenEXR_CTL.pc.in.orig 2013-10-22 19:39:04.000000000
+0200
-+++ CTL-ctl-1.5/config/OpenEXR_CTL.pc.in 2014-04-06 14:25:12.715949805
+0200
-@@ -1,11 +1,12 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=@INSTALL_BIN_DIR@
-+libdir=@INSTALL_LIB_DIR@
-+includedir=@INSTALL_INCLUDE_DIR@
-+OpenEXR_includedir=@INSTALL_INCLUDE_DIR@/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@
-+Requires: CTL OpenEXR
-+Libs: -L${libdir} -lIlmImfCtl
-+Cflags: -I${OpenEXR_includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ctl.git/commitdiff/c41eaa3cfd8cab7357473206bebcfd202473a1fa
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
