commit: 0e71cefa9cdbb19d722c823448df7b9e186164b8 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Feb 7 06:25:19 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Wed Feb 9 23:01:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e71cefa
media-video/handbrake: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/24104 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...audio-encoders-when-linking-to-FFmpeg-4.4.patch | 28 -------- .../handbrake-1.3.3-remove-faac-dependency.patch | 84 ---------------------- 2 files changed, 112 deletions(-) diff --git a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch deleted file mode 100644 index d7cc565377fd..000000000000 --- a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001 -From: Damiano Galassi <[email protected]> -Date: Sat, 10 Apr 2021 13:18:02 +0200 -Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4. - ---- - libhb/encavcodecaudio.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c -index 52fc4565d..e6cf42414 100644 ---- a/libhb/encavcodecaudio.c -+++ b/libhb/encavcodecaudio.c -@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list) - - // Prepare input frame - int out_size; -- AVFrame frame = { .nb_samples = pv->samples_per_frame, }; -+ AVFrame frame = { .nb_samples = pv->samples_per_frame, -+ .format = pv->context->sample_fmt, -+ .channels = pv->context->channels -+ }; - - out_size = av_samples_get_buffer_size(NULL, - pv->context->channels, --- -2.26.3 - diff --git a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch deleted file mode 100644 index 7e8ab99730a8..000000000000 --- a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- a/libhb/common.c -+++ b/libhb/common.c -@@ -243,7 +243,6 @@ - { - // legacy encoders, back to HB 0.9.4 whenever possible (disabled) - { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, }, -- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, }, - { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, }, - { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, }, - { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, }, ---- a/scripts/manicure.rb -+++ b/scripts/manicure.rb -@@ -349,7 +349,7 @@ - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -466,7 +466,7 @@ - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -753,7 +753,7 @@ - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -870,7 +870,7 @@ - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -1163,7 +1163,7 @@ - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -1298,7 +1298,7 @@ - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -1615,7 +1615,7 @@ - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -1732,7 +1732,7 @@ - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac"
