Bump CI Ubuntu image to 24.04

Author: twistedfall

.github/workflows/opencv-rust.yml

@@ -12,20 +12,20 @@ jobs:
       fail-fast: false
       matrix:
         os-image:
-          - ubuntu-22.04
+          - ubuntu-24.04
           - macos-14
         opencv-version:
           - 4.11.0
         linkage:
           - dynamic
         include:
-          - os-image: ubuntu-22.04
+          - os-image: ubuntu-24.04
             opencv-version: 4.11.0
             linkage: static
-          - os-image: ubuntu-22.04
+          - os-image: ubuntu-24.04
             opencv-version: 5.0.0-alpha
             linkage: dynamic
-          - os-image: ubuntu-22.04
+          - os-image: ubuntu-24.04
             opencv-version: 3.4.20
             linkage: dynamic
           - os-image: macos-13
@@ -67,7 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         os-image:
-          - ubuntu-22.04
+          - ubuntu-24.04
           - windows-2022
           - macos-14
         vcpkg-version:
@@ -104,6 +104,9 @@ jobs:
           - opencv: 3.4.16
           - opencv: 4.10.0
         include:
+          - os-image: ubuntu-24.04
+            version:
+              opencv: 4.6.0
           - os-image: ubuntu-22.04
             version:
               opencv: 4.5.4
@@ -133,7 +136,7 @@ jobs:
         shell: bash
 
   docs-rs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable

ci/install-ubuntu.sh

@@ -30,6 +30,13 @@ case "$ubuntu_version" in
 		exit 0
 	fi
 	;;
+
+"24.04")
+	if [[ "$OPENCV_VERSION" == "4.6.0" ]]; then
+		sudo apt-get -y install "libopencv-dev=${OPENCV_VERSION}*"
+		exit 0
+	fi
+	;;
 esac
 
 BUILD_FLAGS="
@@ -136,7 +143,6 @@ BUILD_FLAGS="
 sudo apt-get -y install build-essential cmake
 
 if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
-# bring back -D BUILD_TBB=ON when updated to Ubuntu-24.04 (https://github.com/opencv/opencv/issues/25187)
 	BUILD_FLAGS="$BUILD_FLAGS
 	-D BUILD_JPEG=ON
 	-D BUILD_OPENJPEG=ON
@@ -157,6 +163,7 @@ if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
 	-D WITH_LAPACK=OFF
 	-D WITH_OPENGL=OFF
 	-D WITH_QT=OFF
+	-D BUILD_TBB=ON
 "
 else # dynamic build
 	case "$ubuntu_version" in
@@ -256,6 +263,38 @@ else # dynamic build
 			libwebp-dev \
 			qtbase5-dev
 		;;
+
+	"24.04")
+		# runtime deps
+		sudo apt-get -y install \
+			libatlas-base-dev \
+			libavcodec-dev \
+			libavformat-dev \
+			libceres-dev \
+			libdc1394-dev \
+			libeigen3-dev \
+			libfreetype6-dev \
+			libgdal-dev \
+			libgflags-dev \
+			libgoogle-glog-dev \
+			libgphoto2-dev \
+			libgstreamer-plugins-base1.0-dev \
+			libharfbuzz-dev \
+			libhdf5-dev \
+			libjpeg-dev \
+			liblapacke64-dev \
+			libleptonica-dev \
+			libopenexr-dev \
+			libpng-dev \
+			libswscale-dev \
+			libtbb-dev \
+			libtesseract-dev \
+			libtiff-dev \
+			libunwind-dev \
+			libvtk9-dev \
+			libwebp-dev \
+			qtbase5-dev
+		;;
 	esac
 fi