gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

media-video/handbrake: added missing includes + scrubbed patches

Browse Source 
Closes: https://bugs.gentoo.org/921166
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
2024-07-05 11:05:16 +02:00
parent df78126aff
commit c8e55f2fac
7 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
View File

@@ -1,5 +1,3 @@
diff --git a/configure b/configure
index 5c870e1d7..2f5834083 100755
--- a/configure
+++ b/configure
@@ -14,20 +14,8 @@ inpath()

4
media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
View File

@@ -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

9
media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch
View File

@@ -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 @@

20
media-video/handbrake/files/handbrake-1.6.1-missing-include.patch Normal file
View File

@@ -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"

4
media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
View File

@@ -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

2
media-video/handbrake/files/handbrake-9999-system-tools.patch
View File

@@ -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:

2
media-video/handbrake/handbrake-1.6.1.ebuild
View File

@@ -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() {