Skip to content

Commit ba7432b

Browse files
build(deps)!: bump x265 from 3.6 to 4.1 (#441)
1 parent ec01928 commit ba7432b

File tree

4 files changed

+38
-10
lines changed

4 files changed

+38
-10
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
env:
24+
LINUX_GCC_VERSION: 12
2425
MACOSX_DEPLOYMENT_TARGET: 13.0
2526

2627
jobs:
@@ -84,9 +85,9 @@ jobs:
8485
- name: Checkout
8586
uses: actions/checkout@v4
8687

87-
- name: Setup cross compiling Linux
88+
- name: Prepare Dependencies Linux
8889
id: cross_compile
89-
if: contains(matrix.os, 'ubuntu')
90+
if: runner.os == 'Linux'
9091
run: |
9192
echo "::group::distro detection"
9293
# detect dist name like bionic, focal, etc
@@ -144,12 +145,19 @@ jobs:
144145
package_arch=$(dpkg --print-architecture)
145146
if [[ ${{ matrix.arch }} == "aarch64" ]]; then
146147
dependencies+=("crossbuild-essential-arm64")
148+
dependencies+=("gcc-${LINUX_GCC_VERSION}-aarch64-linux-gnu")
149+
dependencies+=("g++-${LINUX_GCC_VERSION}-aarch64-linux-gnu")
147150
cross_compile=true
148151
package_arch="arm64"
149152
elif [[ ${{ matrix.arch }} == "powerpc64le" ]]; then
150153
dependencies+=("crossbuild-essential-ppc64el")
154+
dependencies+=("gcc-${LINUX_GCC_VERSION}-powerpc64le-linux-gnu")
155+
dependencies+=("g++-${LINUX_GCC_VERSION}-powerpc64le-linux-gnu")
151156
cross_compile=true
152157
package_arch="ppc64el"
158+
else
159+
dependencies+=("gcc-${LINUX_GCC_VERSION}")
160+
dependencies+=("g++-${LINUX_GCC_VERSION}")
153161
fi
154162
echo "cross compiling: $cross_compile"
155163
echo "package architecture: $package_arch"
@@ -235,10 +243,18 @@ jobs:
235243
236244
echo "PKG_CONFIG_PATH=${pkg_config_sysroot_dir}/pkgconfig"
237245
echo "PKG_CONFIG_PATH=${pkg_config_sysroot_dir}/pkgconfig" >> $GITHUB_ENV
246+
247+
if [[ ${cross_compile} == false ]]; then
248+
echo "CC=gcc-${LINUX_GCC_VERSION}"
249+
echo "CC=gcc-${LINUX_GCC_VERSION}" >> $GITHUB_ENV
250+
251+
echo "CXX=g++-${LINUX_GCC_VERSION}"
252+
echo "CXX=g++-${LINUX_GCC_VERSION}" >> $GITHUB_ENV
253+
fi
238254
echo "::endgroup::"
239255
240-
- name: Install system dependencies Linux
241-
if: contains(matrix.os, 'ubuntu')
256+
- name: Setup Dependencies Linux
257+
if: runner.os == 'Linux'
242258
run: |
243259
echo "::group::apt update"
244260
sudo apt-get update
@@ -274,7 +290,7 @@ jobs:
274290
275291
brew install ${dependencies[@]}
276292
277-
- name: Setup Dependencies Windows
293+
- name: Setup msys2 Windows
278294
if: runner.os == 'Windows'
279295
uses: msys2/setup-msys2@v2
280296
with:

cmake/toolchains/aarch64-linux-gnu.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
set(CMAKE_SYSTEM_NAME Linux)
44
set(CMAKE_SYSTEM_PROCESSOR aarch64)
55

6+
if(DEFINED ENV{LINUX_GCC_VERSION}) # cmake-lint: disable=W0106
7+
set(LINUX_GCC_VERSION "-$ENV{LINUX_GCC_VERSION}")
8+
else()
9+
set(LINUX_GCC_VERSION "") # default to no version suffix
10+
endif()
11+
612
set(CMAKE_C_COMPILER_TARGET aarch64-linux-gnu)
713
set(CMAKE_CXX_COMPILER_TARGET ${CMAKE_C_COMPILER_TARGET})
8-
set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_TARGET}-gcc)
9-
set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER_TARGET}-g++)
14+
set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_TARGET}-gcc${LINUX_GCC_VERSION})
15+
set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER_TARGET}-g++${LINUX_GCC_VERSION})
1016

1117
set(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_C_COMPILER_TARGET})

cmake/toolchains/powerpc64le-linux-gnu.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
set(CMAKE_SYSTEM_NAME Linux)
44
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
55

6+
if(DEFINED ENV{LINUX_GCC_VERSION}) # cmake-lint: disable=W0106
7+
set(LINUX_GCC_VERSION "-$ENV{LINUX_GCC_VERSION}")
8+
else()
9+
set(LINUX_GCC_VERSION "") # default to no version suffix
10+
endif()
11+
612
set(CMAKE_C_COMPILER_TARGET powerpc64le-linux-gnu)
713
set(CMAKE_CXX_COMPILER_TARGET ${CMAKE_C_COMPILER_TARGET})
8-
set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_TARGET}-gcc)
9-
set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER_TARGET}-g++)
14+
set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_TARGET}-gcc${LINUX_GCC_VERSION})
15+
set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER_TARGET}-g++${LINUX_GCC_VERSION})
1016

1117
set(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_C_COMPILER_TARGET})

third-party/FFmpeg/x265_git

Submodule x265_git updated 167 files

0 commit comments

Comments
 (0)