diff --git a/.ci_support/migrations/svt_av1180.yaml b/.ci_support/migrations/svt_av1180.yaml deleted file mode 100644 index a8b45a0e..00000000 --- a/.ci_support/migrations/svt_av1180.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1702366482.5623324 -svt_av1: -- 1.8.0 diff --git a/.gitignore b/.gitignore index c89ecb7d..c0029107 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +* +!/conda-forge.yml -build_artifacts +!/*/ +!/recipe/** +!/.ci_support/** + +*.pyc diff --git a/README.md b/README.md index 5fe85988..4c6ac9ef 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ About ffmpeg Home: https://www.ffmpeg.org/ -Package license: LGPL-2.1-or-later +Package license: GPL-2.0-or-later Summary: Cross-platform solution to record, convert and stream audio and video. @@ -22,7 +22,7 @@ About ffmpeg Home: https://www.ffmpeg.org/ -Package license: GPL-2.0-or-later +Package license: LGPL-2.1-or-later Summary: Cross-platform solution to record, convert and stream audio and video. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a5144307..aef121b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "6.1.0" %} # semver: (x.y.z) +{% set version = "6.1.1" %} # semver: (x.y.z) {% set x,y,z = version.split('.') %} {% set version_ffmpeg_style = x ~ '.' ~ y if z == "0" else version %} @@ -8,7 +8,7 @@ package: source: url: https://ffmpeg.org/releases/ffmpeg-{{ version_ffmpeg_style }}.tar.gz - sha256: 938dd778baa04d353163ca5cb06c909c918850055f549205b29b1224e45a5316 + sha256: b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb patches: - patches/pkgconfig_generate_windows_llvm.patch # [win] # I don't really think that the original changes made at FFmpeg make sense for @@ -17,7 +17,7 @@ source: # https://github.com/conda-forge/ffmpeg-feedstock/pull/193#issuecomment-1484476264 - patches/0001-Revert-compat-Use-instead-of-for-rc.exe-options.patch -{% set build = 5 %} +{% set build = 0 %} {% if license_family == 'gpl' %} {% set build = build + 100 %} {% endif %} @@ -80,7 +80,7 @@ requirements: - libxcb # [linux] - xorg-libx11 # [linux] -{% set grep = "grep" %} # [unix] +{% set grep = "grep" %} # [unix] {% set grep = "findstr" %} # [win] test: