Skip to content

Remove SDL2 workarounds #319

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

Merged
conda-forge-admin merged 4 commits into from
Feb 26, 2025
Merged

Remove SDL2 workarounds #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f3409f
dummy commit for rerendering
conda-forge-webservices[bot] Feb 26, 2025
ddf61a7
Remove sdl2 pin
hmaarrfk Feb 26, 2025
89751b6
bump build number
hmaarrfk Feb 26, 2025
0173f5a
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and co…
Feb 26, 2025
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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_build_number_increment0ffnvcodec_headersNonelicense_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_build_number_increment0ffnvcodec_headersNonelicense_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_build_number_increment400ffnvcodec_headers12.1.14license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion ...support/linux_64_build_number_increment400ffnvcodec_headers12.1.14license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_build_number_increment600ffnvcodec_headers12.2.72license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion ...support/linux_64_build_number_increment600ffnvcodec_headers12.2.72license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_build_number_increment0ffnvcodec_headersNonelicense_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion ...support/linux_aarch64_build_number_increment0ffnvcodec_headersNonelicense_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion ...ort/linux_aarch64_build_number_increment600ffnvcodec_headers12.2.72license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion ...rt/linux_aarch64_build_number_increment600ffnvcodec_headers12.2.72license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ openssl:
pulseaudio_client:
- '17.0'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment0ffnvcodec_headersNonelicense_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment0ffnvcodec_headersNonelicense_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment400ffnvcodec_headers12.1.14license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment400ffnvcodec_headers12.1.14license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment600ffnvcodec_headers12.2.72license_familygpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_build_number_increment600ffnvcodec_headers12.2.72license_familylgpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ openh264:
openssl:
- '3'
sdl2:
- 2.30.10
- '2'
svt_av1:
- 3.0.0
target_platform:
Expand Down
3 changes: 0 additions & 3 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ license_family:
- lgpl
- gpl

sdl2:
- 2.30.10

# hmaarrfk
# These could be wrong, but I'm not too sure how to find an exact correspondance
# between the cuda version and the nvidia driver version
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source:
# https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/12
- patches/12-svtav1_300_support.patch

{% set build = 14 %}
{% set build = 15 %}
{% if license_family == 'gpl' %}
{% set build = build + 100 %}
{% endif %}
Expand Down