remove libraw and aces_container

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

.github/workflows/ci.yml

@@ -20,13 +20,13 @@ jobs:
           - desc: gcc11
             nametag: linux-vfx2022-gcc11
             os: ubuntu-latest
-            container: aswf/ci-osl:2022-clang11
+            container: aswf/ci-osl:2022-clang11.10
             vfxyear: 2022
             cxx_std: 17
           - desc: clang14
             nametag: linux-vfx2022-clang14
             os: ubuntu-latest
-            container: aswf/ci-osl:2022-clang11
+            container: aswf/ci-osl:2022-clang11.10
             vfxyear: 2022
             cc_compiler: clang
             cxx_compiler: clang++
@@ -62,8 +62,7 @@ jobs:
       - name: Dependencies
         shell: bash
         run: |
-            build_scripts/install_aces_container.bash
-            sudo yum install --setopt=tsflags=nodocs -y eigen3-devel ceres-solver-devel LibRaw-devel json-devel
+            sudo yum install --setopt=tsflags=nodocs -y eigen3-devel ceres-solver-devel json-devel
 
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -77,11 +76,15 @@ jobs:
 
       - name: Build
         run: |
-          sudo cmake --build build
+          sudo cmake --build build --config Release
 
       - name: Test
         working-directory: build
-        run: ctest --rerun-failed --output-on-failure
+        run: >
+          ctest 
+          --build-config Release
+          --rerun-failed
+          --output-on-failure
 
   aswf:
     name: "VFX${{matrix.vfxyear}} ${{matrix.desc}}"
@@ -146,8 +149,7 @@ jobs:
       - name: Dependencies
         shell: bash
         run: |
-            build_scripts/install_aces_container.bash
-            sudo yum install --setopt=tsflags=nodocs -y eigen3-devel ceres-solver-devel LibRaw-devel json-devel
+            sudo yum install --setopt=tsflags=nodocs -y eigen3-devel ceres-solver-devel json-devel
 
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -230,7 +232,6 @@ jobs:
       - name: Dependencies
         shell: bash
         run: |
-          build_scripts/install_aces_container.bash
           build_scripts/${{ matrix.install_deps }}.bash
 
       - name: Configure CMake
@@ -254,7 +255,8 @@ jobs:
       - name: Test
         # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest --build-config ${{ matrix.build_type }} --rerun-failed --output-on-failure
+        working-directory: build
+        run: ctest --build-config Release --rerun-failed --output-on-failure
 
       - name: Configure config_tests
         run: >

CMakeLists.txt

@@ -12,7 +12,7 @@ set( RAWTOACES_PATCH_VERSION 0 )
 set( RAWTOACES_VERSION ${RAWTOACES_MAJOR_VERSION}.${RAWTOACES_MINOR_VERSION}.${RAWTOACES_PATCH_VERSION} )
 
 set(RAWTOACES_CORE_LIB "rawtoaces_core")
-set(RAWTOACESLIB "rawtoaces_util")
+set(RAWTOACES_UTIL_LIB "rawtoaces_util")
 
 set( CMAKE_MACOSX_RPATH 1 )
 
@@ -78,7 +78,7 @@ include ( configure.cmake )
 
 add_definitions( -DPACKAGE="RAWTOACES" -DVERSION="${RAWTOACES_VERSION}" )
 add_subdirectory("src/${RAWTOACES_CORE_LIB}")
-add_subdirectory("src/${RAWTOACESLIB}")
+add_subdirectory("src/${RAWTOACES_UTIL_LIB}")
 add_subdirectory("src/rawtoaces")
 
 enable_testing()

build_scripts/install_deps_linux.bash

@@ -9,5 +9,7 @@ time sudo apt-get -q -f install -y \
     libboost-dev \
     libboost-system-dev \
     libboost-test-dev \
-    libraw-dev libceres-dev \
-    nlohmann-json3-dev
+    libceres-dev \
+    nlohmann-json3-dev \
+    libopencv-dev \
+    openimageio-tools libopenimageio-dev

build_scripts/install_deps_mac.bash

@@ -2,4 +2,4 @@
 
 set -ex
 
-brew install ceres-solver imath libraw boost nlohmann-json
+brew install ceres-solver imath boost nlohmann-json openimageio

build_scripts/install_deps_windows.bash

@@ -3,11 +3,11 @@
 set -ex
 
 vcpkg install \
-    libraw:x64-windows \
     ceres:x64-windows \
     imath:x64-windows \
     boost-system:x64-windows \
     boost-foreach:x64-windows \
     boost-test:x64-windows \
     boost-property-tree:x64-windows \
-    nlohmann-json:x64-windows
+    nlohmann-json:x64-windows \
+    openimageio:x64-windows

config/RAWTOACES.pc.in

@@ -7,5 +7,5 @@ RAWTOACES_includedir=@INSTALL_INCLUDE_DIR@/rawtoaces
 Name: RAWTOACES
 Description: RAWTOACES raw image to ACES
 Version: @RAWTOACES_VERSION@
-Libs: -L${libdir} -lCeres -lraw -lAcesContainer -lHalf
+Libs: -L${libdir} -lCeres
 Cflags: -I${RAWTOACES_includedir}

config/RAWTOACESConfig.cmake.in

@@ -8,11 +8,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/RAWTOACESTargets.cmake)
 
 include(CMakeFindDependencyMacro)
 
-find_dependency ( AcesContainer )
 find_dependency ( Eigen3 )
 find_dependency ( Ceres )
-find_dependency ( libraw )
-find_dependency ( Imath )
 find_dependency ( Boost COMPONENTS system )
+find_dependency ( OpenImageIO )
+
 
 check_required_components(rawtoaces)

configure.cmake

@@ -2,11 +2,10 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
 
-
 find_package ( nlohmann_json CONFIG REQUIRED )
-find_package ( AcesContainer CONFIG REQUIRED )
+find_package ( OpenImageIO   CONFIG REQUIRED )
 find_package ( Eigen3        CONFIG REQUIRED )
-find_package ( Imath         CONFIG REQUIRED )
+#find_package ( Imath         CONFIG REQUIRED )
 find_package ( Boost         CONFIG REQUIRED
     COMPONENTS
         system
@@ -18,13 +17,3 @@ if (RTA_CENTOS7_CERES_HACK)
 else ()
     find_package ( Ceres CONFIG REQUIRED )
 endif ()
-
-find_package (libraw CONFIG QUIET )
-
-if (libraw_FOUND )
-    message("STATUS LibRaw config found")
-    set ( LIBRAW_CONFIG_FOUND TRUE )
-else ()
-    message("WARNING LibRaw config not found, trying to find a module.")
-    find_package(libraw MODULE REQUIRED)
-endif ()