From 50de63c77b428c0c92bee134240b79d0630daa98 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 20:14:31 +0300 Subject: [PATCH] Merge and update to 5.1.3-1 --- .ffmpeg.metadata | 3 +++ .gitignore | 7 +++---- enable_decoders => SOURCES/enable_decoders | 0 enable_encoders => SOURCES/enable_encoders | 0 SOURCES/ffmpeg-5.1.3.tar.xz.asc | 11 +++++++++++ .../ffmpeg-allow-fdk-aac-free.patch | 0 .../ffmpeg-codec-choice.patch | 0 .../ffmpeg-dlopen-openh264.patch | 0 .../ffmpeg-new-coder-errors.patch | 0 .../ffmpeg_find_free_source_headers.sh | 0 ffmpeg_free_sources => SOURCES/ffmpeg_free_sources | 0 .../ffmpeg_gen_free_tarball.sh | 0 .../ffmpeg_get_dlopen_headers.sh | 0 .../ffmpeg_update_free_sources.sh | 0 ffmpeg.spec => SPECS/ffmpeg.spec | 3 +++ 15 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 .ffmpeg.metadata rename enable_decoders => SOURCES/enable_decoders (100%) rename enable_encoders => SOURCES/enable_encoders (100%) create mode 100644 SOURCES/ffmpeg-5.1.3.tar.xz.asc rename ffmpeg-allow-fdk-aac-free.patch => SOURCES/ffmpeg-allow-fdk-aac-free.patch (100%) rename ffmpeg-codec-choice.patch => SOURCES/ffmpeg-codec-choice.patch (100%) rename ffmpeg-dlopen-openh264.patch => SOURCES/ffmpeg-dlopen-openh264.patch (100%) rename ffmpeg-new-coder-errors.patch => SOURCES/ffmpeg-new-coder-errors.patch (100%) rename ffmpeg_find_free_source_headers.sh => SOURCES/ffmpeg_find_free_source_headers.sh (100%) rename ffmpeg_free_sources => SOURCES/ffmpeg_free_sources (100%) rename ffmpeg_gen_free_tarball.sh => SOURCES/ffmpeg_gen_free_tarball.sh (100%) rename ffmpeg_get_dlopen_headers.sh => SOURCES/ffmpeg_get_dlopen_headers.sh (100%) rename ffmpeg_update_free_sources.sh => SOURCES/ffmpeg_update_free_sources.sh (100%) rename ffmpeg.spec => SPECS/ffmpeg.spec (99%) diff --git a/.ffmpeg.metadata b/.ffmpeg.metadata new file mode 100644 index 0000000..63baa85 --- /dev/null +++ b/.ffmpeg.metadata @@ -0,0 +1,3 @@ +81b8a0552dbd1c5e0c6e595f2174351397435d76 SOURCES/ffmpeg-dlopen-headers.tar.xz +678b051ad6388318c9981b98071962d45b424ed5 SOURCES/ffmpeg-free-5.1.3.tar.xz +ef85643caa3e7814da1b1cf49ac97b28f8c28c56 SOURCES/ffmpeg.keyring diff --git a/.gitignore b/.gitignore index f0c157a..6830dbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -ffmpeg-*.asc -ffmpeg-*.rpm -ffmpeg-*.tar.xz -/ffmpeg.keyring +SOURCES/ffmpeg-dlopen-headers.tar.xz +SOURCES/ffmpeg-free-5.1.3.tar.xz +SOURCES/ffmpeg.keyring diff --git a/enable_decoders b/SOURCES/enable_decoders similarity index 100% rename from enable_decoders rename to SOURCES/enable_decoders diff --git a/enable_encoders b/SOURCES/enable_encoders similarity index 100% rename from enable_encoders rename to SOURCES/enable_encoders diff --git a/SOURCES/ffmpeg-5.1.3.tar.xz.asc b/SOURCES/ffmpeg-5.1.3.tar.xz.asc new file mode 100644 index 0000000..4d6146b --- /dev/null +++ b/SOURCES/ffmpeg-5.1.3.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmQgVfwYHGZmbXBlZy1k +ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYntkH/1aN/nVkVPhbalrPdX14VIau +aW2OxXleh7AJe9FVjYduJPQZHS5+wm1GTTl5/IHje3sMG54RdkezRIfx/XCeZefd +c+P6OPvqpIXvhEHoKABB/hD7bI/+0bkAfUtDDp0Nfv05sag9PPC0XAJfLGlvWTPl +Ci8rLbO7VnsOo35+3dRVHgx6N6vNQuKRx5oZVgb3GEo18gjV1zsoDD91cQjR7GeF +64Jol7CPAikSnGwi3rxjARTk+V2YqaPM0KY/VR9QlVReIT2CdrRvQtUTvL1WB5mC +6nQ3tHDkRk5uEohAT+e9dxAUBxSTQhKHJn8V4pFS1QVBKH4slPqGvTPnKf5vg+8= +=Tdc7 +-----END PGP SIGNATURE----- diff --git a/ffmpeg-allow-fdk-aac-free.patch b/SOURCES/ffmpeg-allow-fdk-aac-free.patch similarity index 100% rename from ffmpeg-allow-fdk-aac-free.patch rename to SOURCES/ffmpeg-allow-fdk-aac-free.patch diff --git a/ffmpeg-codec-choice.patch b/SOURCES/ffmpeg-codec-choice.patch similarity index 100% rename from ffmpeg-codec-choice.patch rename to SOURCES/ffmpeg-codec-choice.patch diff --git a/ffmpeg-dlopen-openh264.patch b/SOURCES/ffmpeg-dlopen-openh264.patch similarity index 100% rename from ffmpeg-dlopen-openh264.patch rename to SOURCES/ffmpeg-dlopen-openh264.patch diff --git a/ffmpeg-new-coder-errors.patch b/SOURCES/ffmpeg-new-coder-errors.patch similarity index 100% rename from ffmpeg-new-coder-errors.patch rename to SOURCES/ffmpeg-new-coder-errors.patch diff --git a/ffmpeg_find_free_source_headers.sh b/SOURCES/ffmpeg_find_free_source_headers.sh similarity index 100% rename from ffmpeg_find_free_source_headers.sh rename to SOURCES/ffmpeg_find_free_source_headers.sh diff --git a/ffmpeg_free_sources b/SOURCES/ffmpeg_free_sources similarity index 100% rename from ffmpeg_free_sources rename to SOURCES/ffmpeg_free_sources diff --git a/ffmpeg_gen_free_tarball.sh b/SOURCES/ffmpeg_gen_free_tarball.sh similarity index 100% rename from ffmpeg_gen_free_tarball.sh rename to SOURCES/ffmpeg_gen_free_tarball.sh diff --git a/ffmpeg_get_dlopen_headers.sh b/SOURCES/ffmpeg_get_dlopen_headers.sh similarity index 100% rename from ffmpeg_get_dlopen_headers.sh rename to SOURCES/ffmpeg_get_dlopen_headers.sh diff --git a/ffmpeg_update_free_sources.sh b/SOURCES/ffmpeg_update_free_sources.sh similarity index 100% rename from ffmpeg_update_free_sources.sh rename to SOURCES/ffmpeg_update_free_sources.sh diff --git a/ffmpeg.spec b/SPECS/ffmpeg.spec similarity index 99% rename from ffmpeg.spec rename to SPECS/ffmpeg.spec index 617faf4..f8a7f91 100644 --- a/ffmpeg.spec +++ b/SPECS/ffmpeg.spec @@ -868,6 +868,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Mon Oct 30 2023 MSVSphere Packaging Team - 5.1.3-1 +- Rebuilt for MSVSphere 9.2 + * Tue Mar 28 2023 Yaakov Selkowitz - 5.1.3-1 - Update to 5.1.3