commit: c8e55f2fac7987ceba39f73eebe4a93ca268a16f Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Jul 5 09:05:16 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Jul 5 09:05:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e55f2f
media-video/handbrake: added missing includes + scrubbed patches Closes: https://bugs.gentoo.org/921166 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../handbrake-1.3.0-dont-search-for-python.patch | 2 -- .../handbrake/files/handbrake-1.3.3-x265-link.patch | 4 ++-- .../handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch | 9 --------- .../files/handbrake-1.6.1-missing-include.patch | 20 ++++++++++++++++++++ .../handbrake-9999-remove-faac-dependency.patch | 4 ---- .../files/handbrake-9999-system-tools.patch | 2 -- media-video/handbrake/handbrake-1.6.1.ebuild | 2 ++ 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch index 551a64ee3817..851ca0a11072 100644 --- a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch +++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 5c870e1d7..2f5834083 100755 --- a/configure +++ b/configure @@ -14,20 +14,8 @@ inpath() diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch index 6a1464571ec3..779366db543b 100644 --- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch +++ b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch @@ -1,5 +1,5 @@ ---- a/test/module.defs 2020-06-13 15:05:35.000000000 +0100 -+++ a/test/module.defs 2020-07-03 11:15:53.951205608 +0100 +--- a/test/module.defs ++++ a/test/module.defs @@ -30,6 +30,10 @@ endif endif diff --git a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch index 643605076294..2ec2f3170de1 100644 --- a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch +++ b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch @@ -9,13 +9,6 @@ avcodec.h stopped including bsf.h per FFmpeg commit 57b5ec6ba7df [1]. Fixes compilation error against FFmpeg later than the mentioned commit. [1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519 ---- - libhb/decavcodec.c | 1 + - libhb/muxavformat.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c -index 372f86f82cf..e7a63289c0f 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -41,6 +41,7 @@ @@ -26,8 +19,6 @@ index 372f86f82cf..e7a63289c0f 100644 #include "libavfilter/avfilter.h" #include "libavfilter/buffersrc.h" #include "libavfilter/buffersink.h" -diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c -index 232edd0942a..ad8e2a1d8fa 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -8,6 +8,7 @@ diff --git a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch new file mode 100644 index 000000000000..cfe16e718fc4 --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch @@ -0,0 +1,20 @@ +--- a/libhb/muxavformat.c ++++ b/libhb/muxavformat.c +@@ -7,6 +7,7 @@ + For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html + */ + ++#include <time.h> + #include <ogg/ogg.h> + #include "libavcodec/bsf.h" + #include "libavformat/avformat.h" +--- a/libhb/work.c ++++ b/libhb/work.c +@@ -7,6 +7,7 @@ + For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html + */ + ++#include <time.h> + #include "handbrake/handbrake.h" + #include "libavformat/avformat.h" + #include "handbrake/decomb.h" diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch index a75bb24bf5b3..12a0814fc056 100644 --- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch +++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch @@ -1,5 +1,3 @@ -diff --git a/libhb/common.c b/libhb/common.c -index f43efdbb5..c917151b7 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[] = @@ -10,8 +8,6 @@ index f43efdbb5..c917151b7 100644 { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC, }, { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AC3, }, { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_MP3, }, -diff --git a/scripts/manicure.rb b/scripts/manicure.rb -index fb4afa9ec..424288298 100755 --- a/scripts/manicure.rb +++ b/scripts/manicure.rb @@ -349,7 +349,7 @@ class Display diff --git a/media-video/handbrake/files/handbrake-9999-system-tools.patch b/media-video/handbrake/files/handbrake-9999-system-tools.patch index 9d76e628ccbb..820b4af8b3e8 100644 --- a/media-video/handbrake/files/handbrake-9999-system-tools.patch +++ b/media-video/handbrake/files/handbrake-9999-system-tools.patch @@ -1,7 +1,5 @@ # https://bugs.gentoo.org/738110 -diff --git a/make/configure.py b/make/configure.py -index 87118fcbe..df869856d 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1626,14 +1626,14 @@ try: diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild b/media-video/handbrake/handbrake-1.6.1.ebuild index 7be693401ffa..427b5614f5b4 100644 --- a/media-video/handbrake/handbrake-1.6.1.ebuild +++ b/media-video/handbrake/handbrake-1.6.1.ebuild @@ -98,6 +98,8 @@ PATCHES=( # Fix x265 linkage... again again #730034 "${FILESDIR}/${PN}-1.3.3-x265-link.patch" + + "${FILESDIR}/${PN}-1.6.1-missing-include.patch" ) src_prepare() {
