Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ffmpeg in wheels to 6.0 #143

Merged
merged 2 commits into from
Apr 1, 2023
Merged

Bump ffmpeg in wheels to 6.0 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b94c6
Bump dep versions.
matham Apr 1, 2023
39ffbf8
Bump ffmpeg to 6.0.
matham Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ci/dep_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# FFMPEG_VERSION and SDL_VERSION are also set in the actions yaml

export FFMPEG_VERSION=5.1.2 # https://ffmpeg.org/releases/
export SDL_VERSION=2.26.3 # https://github.com/libsdl-org/SDL/releases
export SDL_MIXER_VERSION=2.6.2 # https://github.com/libsdl-org/SDL_mixer/releases
export OPENSSL_VERSION=3.0.7 # https://www.openssl.org/source
export FFMPEG_VERSION=6.0 # https://ffmpeg.org/releases/
export SDL_VERSION=2.26.4 # https://github.com/libsdl-org/SDL/releases
export SDL_MIXER_VERSION=2.6.3 # https://github.com/libsdl-org/SDL_mixer/releases
export OPENSSL_VERSION=3.0.8 # https://www.openssl.org/source
export YASM_VERSION=1.3.0 # http://www.tortall.net/projects/yasm/releases
export NASM_VERSION=2.16.01 # https://www.nasm.us/pub/nasm/releasebuilds/
export LAME_VERSION=3.100 # https://sourceforge.net/projects/lame/files/lame/
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pythonapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Python application
on: [push, pull_request]

env:
FFMPEG_VERSION: "5.1.2" # https://ffmpeg.org/releases/
SDL_VERSION: "2.26.3" # https://github.com/libsdl-org/SDL/releases
SDL_MIXER_VERSION: "2.6.2" # https://github.com/libsdl-org/SDL_mixer/releases
FFMPEG_VERSION: "6.0" # https://ffmpeg.org/releases/
SDL_VERSION: "2.26.4" # https://github.com/libsdl-org/SDL/releases
SDL_MIXER_VERSION: "2.6.3" # https://github.com/libsdl-org/SDL_mixer/releases
USE_SDL2_MIXER: "1"
MACOSX_DEPLOYMENT_TARGET: "10.9"
MACOSX_DEPLOYMENT_TARGET_ARM: "11.0"
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
name: py_wheel
path: dist
- name: Upload to GitHub Release
uses: softprops/[email protected].14
uses: softprops/[email protected].15
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
name: py_wheel
path: dist
- name: Upload to GitHub Release
uses: softprops/[email protected].14
uses: softprops/[email protected].15
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
path: dist

- name: Upload to GitHub Release
uses: softprops/[email protected].14
uses: softprops/[email protected].15
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down