Commit ad33af54 for libheif
commit ad33af546bfa1890687d4e649e4511349247286e
Author: Dirk Farin <dirk.farin@gmail.com>
Date: Thu Aug 27 00:22:17 2026 +0200
ci: install libde265, libaom and x265 from the Ubuntu archive instead of the PPAs
ppa:strukturag/libde265 has no packages for Ubuntu 24.04 or newer, and
ppa:strukturag/libheif only provides libheif itself for 24.04, no codec
libraries. The Ubuntu archive has everything the CI needs: libde265
1.0.15 in 24.04 (1.0.16 in 26.04), libaom 3.8.2 and x265 3.5. Drop both
PPAs so that the jobs can run on current runner images.
WITH_LIBDE265=3 was the variant that already installed libde265 from the
archive; it is now identical to WITH_LIBDE265=1 and kept as an alias for
the workflows that use it.
diff --git a/scripts/install-ci-linux.sh b/scripts/install-ci-linux.sh
index 38c60c6d..157d808d 100755
--- a/scripts/install-ci-linux.sh
+++ b/scripts/install-ci-linux.sh
@@ -26,16 +26,12 @@ INSTALL_PACKAGES="gdb "
REMOVE_PACKAGES=
BUILD_ROOT=$ROOT/..
UPDATE_APT=
-ADD_LIBHEIF_PPA=
CURRENT_BRANCH=$TRAVIS_BRANCH
if [ -z "$CURRENT_BRANCH" ]; then
CURRENT_BRANCH=${GITHUB_REF##*/}
fi
-if [ "$WITH_LIBDE265" = "1" ]; then
- echo "Adding PPA strukturag/libde265 ..."
- sudo add-apt-repository -y ppa:strukturag/libde265
- UPDATE_APT=1
+if [ "$WITH_LIBDE265" = "1" ] || [ "$WITH_LIBDE265" = "3" ]; then
INSTALL_PACKAGES="$INSTALL_PACKAGES \
libde265-dev \
"
@@ -59,21 +55,13 @@ if [ "$WITH_LIBDE265" = "2" ]; then
ls -lR $BUILD_ROOT/libde265/dist
fi
-if [ "$WITH_LIBDE265" = "3" ]; then
- INSTALL_PACKAGES="$INSTALL_PACKAGES \
- libde265-dev \
- "
-fi
-
if [ "$WITH_AOM" = "1" ]; then
- ADD_LIBHEIF_PPA=1
INSTALL_PACKAGES="$INSTALL_PACKAGES \
libaom-dev \
"
fi
if [ "$WITH_X265" = "1" ]; then
- ADD_LIBHEIF_PPA=1
INSTALL_PACKAGES="$INSTALL_PACKAGES \
libx265-dev \
"
@@ -149,12 +137,6 @@ elif [ "$MINGW" == "64" ]; then
"
fi
-if [ ! -z "$ADD_LIBHEIF_PPA" ]; then
- echo "Adding PPA strukturag/libheif ..."
- sudo add-apt-repository -y ppa:strukturag/libheif
- UPDATE_APT=1
-fi
-
if [ ! -z "$INSTALL_PACKAGES" ]; then
# The CI environment might have old package lists, so always update before installing.
UPDATE_APT=1