Date: Saturday, June 5, 2021 @ 14:12:22 Author: arojas Revision: 417150
community2extra: Moving opencolorio1 from community to extra Added: opencolorio1/ opencolorio1/repos/ opencolorio1/trunk/ opencolorio1/trunk/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch opencolorio1/trunk/PKGBUILD opencolorio1/trunk/make-coinstallable.patch ------------------------------------------------+ 8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch | 98 +++++++++++++++++++++++ PKGBUILD | 58 +++++++++++++ make-coinstallable.patch | 22 +++++ 3 files changed, 178 insertions(+) Added: opencolorio1/trunk/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch =================================================================== --- opencolorio1/trunk/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch (rev 0) +++ opencolorio1/trunk/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch 2021-06-05 14:12:22 UTC (rev 417150) @@ -0,0 +1,98 @@ +From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001 +From: Jonathan Scruggs <j.scru...@gmail.com> +Date: Fri, 19 Jan 2018 10:17:18 +0000 +Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files + (#501) + +GNUInstallDirs is supported on all platforms and variables are set +to the standard GNU locations. + +Fix the location where the .cmake files are installed. + +Signed-off by: Jonathan Scruggs <j.scru...@gmail.com> +--- + CMakeLists.txt | 9 +++++---- + docs/CMakeLists.txt | 4 ++-- + export/pkgconfig/OpenColorIO.pc.in | 6 ++---- + 3 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a399d57a..473f1b79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,7 @@ endif() + include(ParseArguments) + include(OCIOMacros) + include(ExternalProject) ++include(GNUInstallDirs) + + enable_language(CXX) + +@@ -558,7 +559,7 @@ endif() + configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY) + +-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/) ++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/) + + ############################################################################### + ### CPACK ### +@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC) + set(OCIO_STATIC_COMPILE_DEFINITIONS ) + endif() + endif() +-install(EXPORT OpenColorIO DESTINATION cmake) ++install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO) + file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" + " + get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH) +@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" + + ## targets libraries + associated definitions + if(NOT TARGET OpenColorIO) +- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target ++ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target + if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC) + message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\") + set(OpenColorIO_LIBRARY OpenColorIO) +@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" + message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND}) + " + ) +-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .) ++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO) +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 5970db64..4d97f72c 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -138,7 +138,7 @@ add_custom_target(doc ALL + add_dependencies(doc Sphinx) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html + PATTERN .* EXCLUDE + ) + +@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER) + add_dependencies(pdf latex) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/) ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + endif() +diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in +index 81ab4ce3..c4553a4f 100644 +--- a/export/pkgconfig/OpenColorIO.pc.in ++++ b/export/pkgconfig/OpenColorIO.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@ +-includedir=${prefix}/include +-libdir=${exec_prefix}/lib@LIB_SUFFIX@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: OpenColorIO + Description: A color management framework for visual effects and animation Added: opencolorio1/trunk/PKGBUILD =================================================================== --- opencolorio1/trunk/PKGBUILD (rev 0) +++ opencolorio1/trunk/PKGBUILD 2021-06-05 14:12:22 UTC (rev 417150) @@ -0,0 +1,58 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Contributor: Dumitru Ursu <d...@ceata.org> + +pkgname=opencolorio1 +pkgver=1.1.1 +pkgrel=3 +pkgdesc="A color management framework for visual effects and animation" +arch=('x86_64') +url="https://opencolorio.org" +license=('BSD') +depends=('lcms2' 'tinyxml' 'yaml-cpp') +makedepends=('boost' 'cmake') +source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz + 8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch + make-coinstallable.patch) +sha512sums=('bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33' + 'fd1c6e134ef898a8715333b1e85a606736685ec0fce07188c0fba68ae048edb61dc4f107eff8de79a53dbbf226a1f84bb0a7d046a15fafb981ce02568350fd49' + 'e7ed107012f94e14bc883baade73ac11c136fbd315832b2c770ca4f0e8cb39ca160da86d848f7762c5e531af88315f2e27b65ef294bf05a6a2130af7285e5369') + +prepare() { + mv OpenColorIO-* $pkgname-$pkgver + + cd $pkgname-$pkgver + sed -i "s/-Werror//g" src/core/CMakeLists.txt + sed -i "s/-Werror//g" src/pyglue/CMakeLists.txt + sed -i "s/push(hidden)/push(default)/g" src/core/OCIOYaml.cpp + + patch -Np1 -i "$srcdir"/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch + patch -p1 < "$srcdir"/make-coinstallable.patch # Make it coinstallable with OCIO2 +} + +build() { + cd $pkgname-$pkgver + + mkdir -p build && cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOCIO_BUILD_STATIC=OFF \ + -DOCIO_BUILD_APPS=OFF \ + -DOCIO_BUILD_PYGLUE=OFF \ + -DUSE_EXTERNAL_YAML=ON \ + -DUSE_EXTERNAL_TINYXML=ON \ + -DUSE_EXTERNAL_LCMS=ON + make +} + +package() { + cd "$pkgname-$pkgver"/build + + make DESTDIR="$pkgdir" install + + install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + rm -r "$pkgdir"/usr/lib/{cmake,pkgconfig} # krita provides its own FindOCIO + rm -r "$pkgdir"/usr/share/ocio +} + +# vim:set ts=2 sw=2 et: Added: opencolorio1/trunk/make-coinstallable.patch =================================================================== --- opencolorio1/trunk/make-coinstallable.patch (rev 0) +++ opencolorio1/trunk/make-coinstallable.patch 2021-06-05 14:12:22 UTC (rev 417150) @@ -0,0 +1,22 @@ +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 1eb691b6..1d8e3466 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -56,7 +56,7 @@ if(OCIO_BUILD_SHARED) + endif() + + set_target_properties(OpenColorIO PROPERTIES +- OUTPUT_NAME OpenColorIO ++ OUTPUT_NAME OpenColorIO1 + COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}" + LINK_FLAGS "${EXTERNAL_LINK_FLAGS}") + +@@ -109,7 +109,7 @@ endmacro() + + # public interface + install(FILES ${core_export_headers} +- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO1/) + + # pkg-config + message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")