Bump CI Ubuntu image to 24.04

Author: twistedfall

.github/workflows/opencv-rust.yml

@@ -12,17 +12,17 @@ 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
@@ -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/check.sh

@@ -5,8 +5,5 @@ set -xeu
 sudo apt-get update
 sudo apt-get install -y clang libclang-dev
 
-# workaround to make clang_sys crate detect installed libclang
-sudo ln -fs libclang.so.1 /usr/lib/llvm-14/lib/libclang.so
-
 export RUST_BACKTRACE=full DOCS_RS=1
 cargo doc -vv

ci/docs-rs.sh

@@ -11,9 +11,7 @@ sudo apt-get update
 sudo apt-get install -y clang libharfbuzz0b git curl zip unzip tar bison gperf libx11-dev libxft-dev libxext-dev \
 	libgles2-mesa-dev autoconf libtool build-essential libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev \
 	libdbus-1-dev libxtst-dev sudo python3-jinja2 cmake
-
-# workaround to make clang_sys crate detect installed libclang
-sudo ln -fs libclang.so.1 /usr/lib/llvm-14/lib/libclang.so
+sudo apt-get install -y automake pkg-config
 
 export VCPKG_ROOT="$HOME/build/vcpkg"
 export VCPKG_DISABLE_METRICS=1
@@ -38,7 +36,7 @@ export VCPKG_DEFAULT_TRIPLET=x64-linux
 	which cmake
 	cmake --version
 	if ! ./vcpkg install --clean-after-build --recurse "opencv[contrib,nonfree,ade,opencl]"; then
-		for log in "$VCPKG_ROOT/buildtrees"/**/*out.log; do
+		for log in "$VCPKG_ROOT/buildtrees"/**/*-{out,err}.log; do
 			echo "=== $log"
 			cat "$log"
 		done

ci/install-ubuntu-vcpkg.sh

@@ -8,11 +8,6 @@ ubuntu_version="$(cat /etc/os-release | sed -nr 's:^VERSION_ID="(.+?)":\1: p')"
 
 sudo apt-get install -y clang libclang-dev
 case "$ubuntu_version" in
-"18.04")
-	# workaround to make clang_sys crate detect installed libclang
-	sudo ln -fs libclang.so.1 /usr/lib/llvm-6.0/lib/libclang.so
-	;;
-
 "20.04")
 	# workaround to make clang_sys crate detect installed libclang
 	sudo ln -fs libclang.so.1 /usr/lib/llvm-10/lib/libclang.so
@@ -30,6 +25,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 +138,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
@@ -160,7 +161,7 @@ if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
 "
 else # dynamic build
 	case "$ubuntu_version" in
-	"18.04" | "20.04")
+	"20.04")
 		sudo apt-get -y install \
 			libatlas-base-dev \
 			libavcodec-dev \
@@ -256,6 +257,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