Skip to content

Commit 0fdfa9a

Browse files
authored
ci: Remove unnecessary pkgconfig patches (shssoichiro#86)
* ci: Remove unnecessary pkgconfig patches * ci: Install libc++ on Linux This is necessary for the FFmpeg binaries. It's currently included in 22.04, but not 24.04, so this is futureproofing.
1 parent 1b5d240 commit 0fdfa9a

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,14 @@ jobs:
5656
run: |
5757
sudo apt-get update
5858
sudo apt-get install -y --no-install-recommends \
59-
libva2 libva-drm2 libva-x11-2 libvdpau1 libxv1
59+
libc++1 libva2 libva-drm2 libva-x11-2 libvdpau1 libxv1
6060
- name: Download FFmpeg
6161
shell: bash
6262
run: |
6363
mkdir ffmpeg-libs
6464
curl -L "https://sourceforge.net/projects/avbuild/files/linux/${{ matrix.ffmpeg.file }}/download" \
6565
| tar xJf - --strip 1 -C ffmpeg-libs
6666
67-
# https://github.com/wang-bin/avbuild/issues/76
68-
PC_FILES=(ffmpeg-libs/lib/${{ matrix.ffmpeg.lib_subdir }}/pkgconfig/*.pc)
69-
sed -i 's/^prefix=.*$/prefix=${pcfiledir}\/..\/..\/../g' $PC_FILES
70-
sed -i 's/^libdir=.*$/libdir=${prefix}\/lib\/${{ matrix.ffmpeg.lib_subdir }}/g' $PC_FILES
71-
7267
echo "PKG_CONFIG_PATH=$PWD/ffmpeg-libs/lib/${{ matrix.ffmpeg.lib_subdir }}/pkgconfig" >> "$GITHUB_ENV"
7368
echo "LD_LIBRARY_PATH=$PWD/ffmpeg-libs/lib/${{ matrix.ffmpeg.lib_subdir }}" >> "$GITHUB_ENV"
7469
- name: Install Rust stable with clippy and rustfmt
@@ -200,11 +195,6 @@ jobs:
200195
curl -L "https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-7.1-linux-clang-lite.tar.xz/download" \
201196
| tar xJf - --strip 1 -C ffmpeg-libs
202197
203-
# https://github.com/wang-bin/avbuild/issues/76
204-
PC_FILES=(ffmpeg-libs/lib/amd64/pkgconfig/*.pc)
205-
sed -i 's/^prefix=.*$/prefix=${pcfiledir}\/..\/..\/../g' $PC_FILES
206-
sed -i 's/^libdir=.*$/libdir=${prefix}\/lib\/amd64/g' $PC_FILES
207-
208198
echo "PKG_CONFIG_PATH=$PWD/ffmpeg-libs/lib/amd64/pkgconfig" >> "$GITHUB_ENV"
209199
echo "LD_LIBRARY_PATH=$PWD/ffmpeg-libs" >> "$GITHUB_ENV"
210200
# rust-version from Cargo.toml

0 commit comments

Comments
 (0)