Add opencv to linux CI and specify which modules we want to use

RPCS3 · Feb 24, 2025 · 807c5e2 · 807c5e2
1 parent b08273b
commit 807c5e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -56,7 +56,7 @@ env:
 
 # linux_task:
 #   container:
-#     image: rpcs3/rpcs3-ci-jammy:1.0
+#     image: rpcs3/rpcs3-ci-jammy:1.1
 #     cpu: 4
 #     memory: 16G
 #   env:
@@ -132,7 +132,7 @@ linux_aarch64_task:
   matrix:
     - name: Cirrus Linux AArch64 Clang
       arm_container:
-        image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.0'
+        image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.1'
         cpu: 8
         memory: 8G
       clang_script:

diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
@@ -29,15 +29,15 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.0"
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
             build_sh: "/rpcs3/.ci/build-linux.sh"
             compiler: clang
           - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.0"
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
             build_sh: "/rpcs3/.ci/build-linux.sh"
             compiler: gcc
           - os: ubuntu-24.04-arm
-            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.0"
+            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.1"
             build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
             compiler: clang
     runs-on: ${{ matrix.os }}

diff --git a/3rdparty/opencv/CMakeLists.txt b/3rdparty/opencv/CMakeLists.txt
@@ -4,7 +4,7 @@ set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)
 
 if (USE_SYSTEM_OPENCV)
 	message(STATUS "RPCS3: using system OpenCV")
-	find_package(OpenCV)
+	find_package(OpenCV COMPONENTS core photo)
 
 	if(OPENCV_FOUND)
 		message(STATUS "RPCS3: found system OpenCV")

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -38,13 +38,13 @@ jobs:
     displayName: ccache
 
   - bash: |
-      docker pull --quiet rpcs3/rpcs3-ci-jammy:1.0
+      docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1
       docker run                      \
         -v $(pwd):/rpcs3              \
         --env-file .ci/docker.env \
         -v $CCACHE_DIR:/root/.ccache  \
         -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
-        rpcs3/rpcs3-ci-jammy:1.0 \
+        rpcs3/rpcs3-ci-jammy:1.1 \
         /rpcs3/.ci/build-linux.sh
     displayName: Docker setup and build