* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2015-08-09 13:43 Ian Whyman
0 siblings, 0 replies; 8+ messages in thread
From: Ian Whyman @ 2015-08-09 13:43 UTC (permalink / raw
To: gentoo-commits
commit: b8f141afeb0e183298fe227672ac9338e0e8e12c
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 12:30:22 2015 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 13:43:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f141af
media-video/handbrake: Version Bump to 0.10.2, enable x265, tidyup
- Version bump to 0.10.2
- Cleanup of old versions and patches
- Enable x265: thanks to Peter Foley <pefoley2 <AT> pefoley.com>
for the patch
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
Package-Manager: portage-2.2.20
media-video/handbrake/Manifest | 4 +-
...dbrake-0.9.9-add-gmodule-to-gtk-configure.patch | 11 --
...e-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch | 73 --------
.../handbrake-0.9.9-remove-faac-dependency.patch | 203 ---------------------
.../handbrake-9999-expand-MK_SUBTITLE_PGS.patch | 9 -
...ke-9999-fix-compilation-with-mp4v2-v1.9.1.patch | 75 --------
...handbrake-9999-fix-missing-x265-link-flag.patch | 13 ++
.../files/handbrake-9999-use-older-libmkv.patch | 14 --
.../files/handbrake-9999-use-unpatched-a52.patch | 26 ---
media-video/handbrake/handbrake-0.10.1.ebuild | 148 ---------------
...ke-0.10.0-r1.ebuild => handbrake-0.10.2.ebuild} | 12 +-
media-video/handbrake/handbrake-0.9.9-r1.ebuild | 185 -------------------
media-video/handbrake/handbrake-9999.ebuild | 12 +-
media-video/handbrake/metadata.xml | 2 +-
14 files changed, 31 insertions(+), 756 deletions(-)
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 7ada6bb..bd42f75 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1 @@
-DIST handbrake-0.10.0.tar.bz2 10370718 SHA256 a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114 SHA512 e1793bf11aae384a63bdbb055b7b8998e13053d4519890ef6b6eb73988c5fb88c18e394e6c8f0af92cf7ba62a19ee83d908701a1f376adc2804c31192584d590 WHIRLPOOL 04379fd65000282c7472539aa6621ac668970529c3349f55c1ce5d60a6d96047a3a7e2d5d0d97ec002970769c7b8228ae67ac5623e814c3b2b27192351d8546b
-DIST handbrake-0.10.1.tar.bz2 10441776 SHA256 7ea42031fd4d5efd04903a9aae79c952c50fd43b6f7bf08fd1a93f6b358a23f5 SHA512 8e51a8d141749467a51bc781f3f961d507f693d3081b55964c4cb5a04407fd43331739db3a61c290c35c6da51003705e0e8fafe4c2c157c7a25c9c62df49856d WHIRLPOOL a735fcacf9b157cb2959d351d3fdb043c222ec664893fbd249dbebfceebd9951aabf757cd8c1a19c8911504591c22e67b20ae555dcb07d3cff6140f8f58ffdce
-DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
+DIST handbrake-0.10.2.tar.bz2 10442635 SHA256 4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 SHA512 7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2 WHIRLPOOL cd34833035e3fc866d7a69994717709fd7a808545f6cbaeda1447d6b528010b500f5ef0371b66d4b5c81c958d39d053178595fe32bc6236fdac7003cacd9f7d9
diff --git a/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch b/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch
deleted file mode 100644
index e6f7c44..0000000
--- a/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- HandBrake-0.9.9.orig/gtk/configure.ac 2013-09-01 12:13:06.684612296 +0300
-+++ HandBrake-0.9.9/gtk/configure.ac 2013-09-01 20:09:35.446706059 +0300
-@@ -96,7 +96,7 @@ case $host in
- pkg_gudev="gudev-1.0"
- ;;
- esac
-- GHB_PACKAGES="gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
-+ GHB_PACKAGES="gthread-2.0 gmodule-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
- mingw_flag=no
- ;;
- esac
diff --git a/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch b/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch
deleted file mode 100644
index c558d43..0000000
--- a/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Sun, 22 Apr 2012 05:34:40 -0300
-Subject: libhb: Fix compilation with mp4v2 v1.9.1.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forwarded: no
-Last-Update: 2012-05-15
-Reviewed-by: Rogério Theodoro de Brito <rbrito@ime.usp.br>
-Signed-off-by: Rogério Theodoro de Brito <rbrito@ime.usp.br>
----
- libhb/decmetadata.c | 4 ++--
- libhb/muxmp4.c | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/libhb/decmetadata.c
-+++ b/libhb/decmetadata.c
-@@ -13,7 +13,7 @@
- MP4FileHandle input_file;
- hb_deep_log( 2, "Got an MP4 input, read the metadata");
-
-- input_file = MP4Read( title->path, 0 );
-+ input_file = MP4Read(title->path);
-
- if( input_file != MP4_INVALID_FILE_HANDLE )
- {
-@@ -92,7 +92,7 @@
- }
- }
-
-- MP4Close( input_file );
-+ MP4Close(input_file, 0);
- }
- }
-
---- a/libhb/muxmp4.c
-+++ b/libhb/muxmp4.c
-@@ -93,13 +93,13 @@
- if (job->largeFileSize)
- /* Use 64-bit MP4 file */
- {
-- m->file = MP4Create( job->file, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA );
-+ m->file = MP4Create( job->file, MP4_CREATE_64BIT_DATA );
- hb_deep_log( 2, "muxmp4: using 64-bit MP4 formatting.");
- }
- else
- /* Limit MP4s to less than 4 GB */
- {
-- m->file = MP4Create( job->file, MP4_DETAILS_ERROR, 0 );
-+ m->file = MP4Create( job->file, 0 );
- }
-
- if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1331,14 +1331,14 @@
- MP4TagsFree( tags );
- }
-
-- MP4Close( m->file );
-+ MP4Close( m->file, 0 );
-
- if ( job->mp4_optimize )
- {
- hb_log( "muxmp4: optimizing file" );
- char filename[1024]; memset( filename, 0, 1024 );
- snprintf( filename, 1024, "%s.tmp", job->file );
-- MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
-+ MP4Optimize( job->file, filename );
- remove( job->file );
- rename( filename, job->file );
- }
diff --git a/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch
deleted file mode 100644
index e2726d2..0000000
--- a/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Forward ported version of https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0010-Remove-FAAC-dependency.patch
-
-diff -ur a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
---- a/gtk/src/audiohandler.c 2013-05-05 15:39:27.715401407 +0200
-+++ b/gtk/src/audiohandler.c 2013-05-05 15:42:09.312067074 +0200
-@@ -70,10 +70,7 @@
- if (hb_audio_encoders[ii].encoder == fallback &&
- !(hb_audio_encoders[ii].muxers & mux))
- {
-- if ( mux == HB_MUX_MKV )
-- fallback = HB_ACODEC_LAME;
-- else
-- fallback = HB_ACODEC_FAAC;
-+ fallback = HB_ACODEC_LAME;
- break;
- }
- }
-@@ -130,7 +127,7 @@
- return HB_ACODEC_LAME;
-
- case HB_ACODEC_AAC_PASS:
-- return HB_ACODEC_FAAC;
-+ return HB_ACODEC_FFAAC;
-
- case HB_ACODEC_AC3_PASS:
- return HB_ACODEC_AC3;
-diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
---- a/gtk/src/hb-backend.c 2013-05-05 15:39:27.738734740 +0200
-+++ b/gtk/src/hb-backend.c 2013-05-05 15:43:13.702066676 +0200
-@@ -3767,7 +3767,7 @@
- gint
- ghb_get_default_acodec()
- {
-- return HB_ACODEC_FAAC;
-+ return HB_ACODEC_LAME;
- }
-
- static void
-@@ -4505,13 +4505,9 @@
- {
- codec = HB_ACODEC_AC3;
- }
-- else if (mux == HB_MUX_MKV)
-- {
-- codec = HB_ACODEC_LAME;
-- }
- else
- {
-- codec = HB_ACODEC_FAAC;
-+ codec = HB_ACODEC_LAME;
- }
- value = ghb_lookup_acodec_value(codec);
- ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4525,7 +4521,7 @@
- if (codec == HB_ACODEC_VORBIS)
- {
- a_unsup = "Vorbis";
-- codec = HB_ACODEC_FAAC;
-+ codec = HB_ACODEC_LAME;
- }
- }
- if (a_unsup)
-diff -ur a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
---- a/gtk/src/preset_xlat.c 2013-05-05 15:39:27.775401407 +0200
-+++ b/gtk/src/preset_xlat.c 2013-05-05 15:43:34.888733211 +0200
-@@ -260,7 +260,6 @@
-
- static value_map_t acodec_xlat[] =
- {
-- {"AAC (faac)", "faac"},
- {"AC3 Passthru", "ac3"},
- {"MP3 (lame)", "lame"},
- {"Vorbis (vorbis)", "vorbis"},
-diff -ur a/gtk/src/presets.c b/gtk/src/presets.c
---- a/gtk/src/presets.c 2013-05-05 15:39:27.778734740 +0200
-+++ b/gtk/src/presets.c 2013-05-05 15:43:59.888733056 +0200
-@@ -2029,8 +2029,6 @@
-
- static value_map_t acodec_xlat_compat[] =
- {
-- {"AAC (CoreAudio)", "faac"},
-- {"HE-AAC (CoreAudio)", "faac"},
- {"AC3 (ffmpeg)", "ac3"},
- {"AC3", "ac3"},
- {"MP3 Passthru", "mp3pass"},
-diff -ur a/libhb/common.c b/libhb/common.c
---- a/libhb/common.c 2013-05-05 15:39:27.788734740 +0200
-+++ b/libhb/common.c 2013-05-05 15:45:02.782066001 +0200
-@@ -126,7 +126,6 @@
- { "AAC (CoreAudio)", "ca_aac", HB_ACODEC_CA_AAC, HB_MUX_MP4|HB_MUX_MKV },
- { "HE-AAC (CoreAudio)", "ca_haac", HB_ACODEC_CA_HAAC, HB_MUX_MP4|HB_MUX_MKV },
- #endif
-- { "AAC (faac)", "faac", HB_ACODEC_FAAC, HB_MUX_MP4|HB_MUX_MKV },
- #ifdef USE_FDK_AAC
- { "AAC (FDK)", "fdk_aac", HB_ACODEC_FDK_AAC, HB_MUX_MP4|HB_MUX_MKV },
- { "HE-AAC (FDK)", "fdk_haac", HB_ACODEC_FDK_HAAC, HB_MUX_MP4|HB_MUX_MKV },
-diff -ur a/libhb/common.h b/libhb/common.h
---- a/libhb/common.h 2013-05-05 15:39:27.788734740 +0200
-+++ b/libhb/common.h 2013-05-05 15:45:23.358732540 +0200
-@@ -945,7 +945,6 @@
- extern hb_work_object_t hb_decavcodeca;
- extern hb_work_object_t hb_decavcodecv;
- extern hb_work_object_t hb_declpcm;
--extern hb_work_object_t hb_encfaac;
- extern hb_work_object_t hb_enclame;
- extern hb_work_object_t hb_encvorbis;
- extern hb_work_object_t hb_muxer;
-diff -ur a/libhb/encfaac.c b/libhb/encfaac.c
---- a/libhb/encfaac.c 2013-05-05 15:39:27.802068073 +0200
-+++ b/libhb/encfaac.c 2013-05-05 15:45:51.798732364 +0200
-@@ -1,3 +1,4 @@
-+#if 0
- /* encfaac.c
-
- Copyright (c) 2003-2013 HandBrake Team
-@@ -287,3 +288,4 @@
- return HB_WORK_OK;
- }
-
-+#endif /* 0 */
-\ No newline at end of file
-diff -ur a/libhb/hb.c b/libhb/hb.c
---- a/libhb/hb.c 2013-05-05 15:39:27.805401407 +0200
-+++ b/libhb/hb.c 2013-05-05 15:46:21.548732180 +0200
-@@ -487,7 +487,6 @@
- hb_register( &hb_decavcodeca );
- hb_register( &hb_decavcodecv );
- hb_register( &hb_declpcm );
-- hb_register( &hb_encfaac );
- hb_register( &hb_enclame );
- hb_register( &hb_encvorbis );
- hb_register( &hb_muxer );
-@@ -588,7 +587,6 @@
- hb_register( &hb_decavcodeca );
- hb_register( &hb_decavcodecv );
- hb_register( &hb_declpcm );
-- hb_register( &hb_encfaac );
- hb_register( &hb_enclame );
- hb_register( &hb_encvorbis );
- hb_register( &hb_muxer );
-diff -ur a/libhb/internal.h b/libhb/internal.h
---- a/libhb/internal.h 2013-05-05 15:39:27.805401407 +0200
-+++ b/libhb/internal.h 2013-05-05 15:46:28.215398806 +0200
-@@ -409,7 +409,6 @@
- WORK_DECAVCODEC,
- WORK_DECAVCODECV,
- WORK_DECLPCM,
-- WORK_ENCFAAC,
- WORK_ENCLAME,
- WORK_ENCVORBIS,
- WORK_ENC_CA_AAC,
-diff -ur a/libhb/module.defs b/libhb/module.defs
---- a/libhb/module.defs 2013-05-05 15:39:27.808734740 +0200
-+++ b/libhb/module.defs 2013-05-05 15:46:41.458732057 +0200
-@@ -1,4 +1,4 @@
--__deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
-+__deps__ := A52DEC BZIP2 FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
- LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
- MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
-
-@@ -95,7 +95,7 @@
- LIBHB.lib = $(LIBHB.build/)hb.lib
-
- LIBHB.dll.libs = $(foreach n, \
-- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+ a52 ass avcodec avformat avutil avresample dvdnav dvdread \
- fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
- ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
- $(CONTRIB.build/)lib/lib$(n).a )
-diff -ur a/libhb/muxmkv.c b/libhb/muxmkv.c
---- a/libhb/muxmkv.c 2013-05-05 15:39:27.808734740 +0200
-+++ b/libhb/muxmkv.c 2013-05-05 15:47:03.052065256 +0200
-@@ -256,7 +256,6 @@
- }
- track->codecID = MK_ACODEC_FLAC;
- break;
-- case HB_ACODEC_FAAC:
- case HB_ACODEC_FFAAC:
- case HB_ACODEC_CA_AAC:
- case HB_ACODEC_CA_HAAC:
-diff -ur a/libhb/work.c b/libhb/work.c
---- a/libhb/work.c 2013-05-05 15:39:27.818734740 +0200
-+++ b/libhb/work.c 2013-05-05 15:47:14.658731851 +0200
-@@ -135,7 +135,6 @@
- switch (codec)
- {
- case HB_ACODEC_AC3: return hb_get_work(WORK_ENCAVCODEC_AUDIO);
-- case HB_ACODEC_FAAC: return hb_get_work(WORK_ENCFAAC);
- case HB_ACODEC_LAME: return hb_get_work(WORK_ENCLAME);
- case HB_ACODEC_VORBIS: return hb_get_work(WORK_ENCVORBIS);
- case HB_ACODEC_CA_AAC: return hb_get_work(WORK_ENC_CA_AAC);
-diff -ur a/test/module.defs b/test/module.defs
---- a/test/module.defs 2013-05-05 15:39:27.975401406 +0200
-+++ b/test/module.defs 2013-05-05 15:47:35.322065057 +0200
-@@ -14,7 +14,7 @@
- TEST.libs = $(LIBHB.a)
-
- TEST.GCC.l = \
-- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+ a52 ass avcodec avformat avutil avresample dvdnav dvdread \
- fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
- samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
- bluray xml2 bz2 z
diff --git a/media-video/handbrake/files/handbrake-9999-expand-MK_SUBTITLE_PGS.patch b/media-video/handbrake/files/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
deleted file mode 100644
index 27faeb1..0000000
--- a/media-video/handbrake/files/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/trunk/libhb/muxmkv.c
-+++ b/trunk/libhb/muxmkv.c
-@@ -348,5 +348,5 @@
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
-- track->codecID = MK_SUBTITLE_PGS;
-+ track->codecID = "S_HDMV/PGS";
- break;
- case SSASUB:
\ No newline at end of file
diff --git a/media-video/handbrake/files/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch b/media-video/handbrake/files/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
deleted file mode 100644
index daec03f..0000000
--- a/media-video/handbrake/files/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-
-Forward ported by Tom Wijsman <TomWij@gentoo.org>.
-
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Sun, 22 Apr 2012 05:34:40 -0300
-Subject: libhb: Fix compilation with mp4v2 v1.9.1.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forwarded: no
-Last-Update: 2012-05-15
-Reviewed-by: Rogério Theodoro de Brito <rbrito@ime.usp.br>
-Signed-off-by: Rogério Theodoro de Brito <rbrito@ime.usp.br>
----
- libhb/decmetadata.c | 4 ++--
- libhb/muxmp4.c | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/libhb/decmetadata.c
-+++ b/libhb/decmetadata.c
-@@ -13,7 +13,7 @@
- MP4FileHandle input_file;
- hb_deep_log( 2, "Got an MP4 input, read the metadata");
-
-- input_file = MP4Read( title->path, 0 );
-+ input_file = MP4Read(title->path);
-
- if( input_file != MP4_INVALID_FILE_HANDLE )
- {
-@@ -92,7 +92,7 @@
- }
- }
-
-- MP4Close( input_file );
-+ MP4Close(input_file, 0);
- }
- }
-
---- a/libhb/muxmp4.c
-+++ b/libhb/muxmp4.c
-@@ -93,13 +93,13 @@
- if (job->largeFileSize)
- /* Use 64-bit MP4 file */
- {
-- m->file = MP4Create(m->path, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA);
-+ m->file = MP4Create(m->path, MP4_CREATE_64BIT_DATA);
- hb_deep_log( 2, "muxmp4: using 64-bit MP4 formatting.");
- }
- else
- /* Limit MP4s to less than 4 GB */
- {
-- m->file = MP4Create(m->path, MP4_DETAILS_ERROR, 0);
-+ m->file = MP4Create(m->path, 0);
- }
-
- if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1331,14 +1331,14 @@
- MP4TagsFree( tags );
- }
-
-- MP4Close( m->file );
-+ MP4Close( m->file, 0 );
-
- if ( job->mp4_optimize )
- {
- hb_log( "muxmp4: optimizing file" );
- char filename[1024]; memset( filename, 0, 1024 );
- snprintf(filename, 1024, "%s.tmp", m->path);
-- MP4Optimize(m->path, filename, MP4_DETAILS_ERROR);
-+ MP4Optimize(m->path, filename);
- remove(m->path);
- rename(filename, m->path);
- }
diff --git a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
new file mode 100644
index 0000000..276e38b
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- test/module.defs.bak 2015-06-21 13:19:40.626249439 -0400
++++ test/module.defs 2015-06-21 13:19:54.919757726 -0400
+@@ -25,6 +25,7 @@
+
+ ifeq (1,$(FEATURE.x265))
+ TEST.GCC.D += USE_X265
++ TEST.GCC.l += x265
+ endif
+
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-9999-use-older-libmkv.patch b/media-video/handbrake/files/handbrake-9999-use-older-libmkv.patch
deleted file mode 100644
index 8c25415..0000000
--- a/media-video/handbrake/files/handbrake-9999-use-older-libmkv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0016-use-older-libmkv.patch
-
---- a/libhb/muxmkv.c
-+++ b/libhb/muxmkv.c
-@@ -289,8 +289,7 @@
- {
- // For HE-AAC, write outputSamplingFreq too
- // samplingFreq is half of outputSamplingFreq
-- track->extra.audio.outputSamplingFreq = (float)audio->config.out.samplerate;
-- track->extra.audio.samplingFreq = track->extra.audio.outputSamplingFreq / 2.;
-+ track->extra.audio.samplingFreq = audio->config.out.samplerate / 2.;
- }
- else
- {
\ No newline at end of file
diff --git a/media-video/handbrake/files/handbrake-9999-use-unpatched-a52.patch b/media-video/handbrake/files/handbrake-9999-use-unpatched-a52.patch
deleted file mode 100644
index a50d22d..0000000
--- a/media-video/handbrake/files/handbrake-9999-use-unpatched-a52.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0014-Use-unpatched-a52.patch
-
-Author: Reinhard Tartler <siretart@tauware.de>
-Description: Use unpatched a52
-
-In upstream liba52, the state field is private.
-
-Forwarded: no
---- a/libhb/deca52.c
-+++ b/libhb/deca52.c
-@@ -387,12 +387,15 @@ static hb_buffer_t* Decode(hb_work_objec
- pv->channel_layout,
- pv->nchannels);
- }
-+#if 0
-+ // FIXME: debian uses an unpatched liba52
- if (pv->use_mix_levels)
- {
- hb_audio_resample_set_mix_levels(pv->resample,
- (double)pv->state->slev,
- (double)pv->state->clev);
- }
-+#endif
- if (hb_audio_resample_update(pv->resample))
- {
- hb_log("deca52: hb_audio_resample_update() failed");
\ No newline at end of file
diff --git a/media-video/handbrake/handbrake-0.10.1.ebuild b/media-video/handbrake/handbrake-0.10.1.ebuild
deleted file mode 100644
index 6e2a245..0000000
--- a/media-video/handbrake/handbrake-0.10.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
- ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
- inherit subversion
- KEYWORDS=""
-else
- SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/HandBrake-${PV}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
- dev-libs/jansson
- media-libs/a52dec
- media-libs/libass
- media-libs/libbluray
- media-libs/libdvdnav
- media-libs/libdvdread
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/libvpx
- media-libs/x264:=
- media-sound/lame
- sys-libs/zlib
- libav? ( >=media-video/libav-10.1:0= )
- !libav? ( >=media-video/ffmpeg-2.3:0= )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- )
- gtk? (
- >=x11-libs/gtk+-3.10
- dev-libs/dbus-glib
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- virtual/libgudev:=
- )
- fdk? ( media-libs/fdk-aac )
- "
- #x265? ( =media-libs/x265-1.4 )
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/yasm
- dev-util/intltool
- sys-devel/automake"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Get rid of leftover bundled library build definitions,
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
-
- # Remove faac dependency; TODO: figure out if we need to do this at all.
- epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
-
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- $(use_enable libav-aac) \
- $(use_enable fdk fdk-aac) \
- $(use_enable gtk) \
- $(usex !gstreamer --disable-gst) \
- --disable-x265 || die "Configure failed."
- # $(use_enable x265) \
-}
-
-src_compile() {
- emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-pkg_postinst() {
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
- if use gtk ; then
- einfo ""
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-0.10.0-r1.ebuild b/media-video/handbrake/handbrake-0.10.2.ebuild
similarity index 92%
rename from media-video/handbrake/handbrake-0.10.0-r1.ebuild
rename to media-video/handbrake/handbrake-0.10.2.ebuild
index 6e2a245..0653b7d 100644
--- a/media-video/handbrake/handbrake-0.10.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.10.2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
REQUIRED_USE="^^ ( fdk libav-aac )"
@@ -64,8 +64,8 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
+ x265? ( =media-libs/x265-1.7 )
"
- #x265? ( =media-libs/x265-1.4 )
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -78,6 +78,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch_user
+
# Get rid of leftover bundled library build definitions,
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
"${S}"/make/include/main.defs \
@@ -90,6 +92,9 @@ src_prepare() {
# Remove faac dependency; TODO: figure out if we need to do this at all.
epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
+ # Fix missing x265 link flag
+ epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch
+
cd "${S}/gtk"
# Don't run autogen.sh.
sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
@@ -106,8 +111,7 @@ src_configure() {
$(use_enable fdk fdk-aac) \
$(use_enable gtk) \
$(usex !gstreamer --disable-gst) \
- --disable-x265 || die "Configure failed."
- # $(use_enable x265) \
+ $(use_enable x265) || die "Configure failed."
}
src_compile() {
diff --git a/media-video/handbrake/handbrake-0.9.9-r1.ebuild b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
deleted file mode 100644
index 9a579e8..0000000
--- a/media-video/handbrake/handbrake-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
- ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
- inherit subversion
- KEYWORDS=""
-else
- SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/HandBrake-${PV}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="fdk ffmpeg gstreamer gtk"
-
-# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gstreamer )"
-
-RDEPEND="
- media-libs/a52dec
- media-libs/libass
- media-libs/libbluray
- media-libs/libdvdnav
- media-libs/libdvdread
- media-libs/libmpeg2
- media-libs/libmp4v2:0
- media-libs/libmkv
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/x264:=
- media-sound/lame
- ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
- sys-libs/zlib
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
- )
- gtk? (
- x11-libs/gtk+:3
- dev-libs/dbus-glib
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- virtual/libgudev:=
- )
- fdk? ( media-libs/fdk-aac )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/yasm
- dev-util/intltool
- sys-devel/automake"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Get rid of leftover bundled library build definitions,
- # the version 0.9.9 supports the use of system libraries.
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- # Instead of adding a #define to libmkv, we expand it in place.
- epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
-
- # Fix compilation against the released 1.9.1 version of mp4v2.
- epatch "${FILESDIR}"/${P}-fix-compilation-with-mp4v2-v1.9.1.patch
-
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
-
- # Remove faac dependency until its compilation errors can be resolved.
- epatch "${FILESDIR}"/${P}-remove-faac-dependency.patch
- sed -i 's/-lfaac//' gtk/configure.ac || die
-
- # Make use of an older version of libmkv.
- epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
-
- # Make use of an unpatched version of a52 that does not make a private field public.
- epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
-
- # Add gmodule to the linker command line for bug #482674.
- epatch "${FILESDIR}"/${P}-add-gmodule-to-gtk-configure.patch
-
- # Fixup configure.ac with newer automake
- cd "${S}/gtk"
- sed -i \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
- -e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
- configure.ac || die "Fixing up configure.ac failed"
-
- # Don't run autogen.sh
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- if ! use gtk ; then
- myconf+=" --disable-gtk"
- fi
-
- if ! use gstreamer ; then
- myconf+=" --disable-gst"
- fi
-
- if use ffmpeg ; then
- myconf+=" --enable-ff-mpeg2"
- fi
-
- if use fdk ; then
- myconf+=" --enable-fdk-aac"
- fi
-
- ./configure \
- --force \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- ${myconf} || die "Configure failed."
-}
-
-src_compile() {
- emake -C build
-
- # Documentation building is currently broken.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-pkg_postinst() {
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
- if use gtk ; then
- einfo ""
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 6e2a245..0653b7d 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
REQUIRED_USE="^^ ( fdk libav-aac )"
@@ -64,8 +64,8 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
+ x265? ( =media-libs/x265-1.7 )
"
- #x265? ( =media-libs/x265-1.4 )
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -78,6 +78,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch_user
+
# Get rid of leftover bundled library build definitions,
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
"${S}"/make/include/main.defs \
@@ -90,6 +92,9 @@ src_prepare() {
# Remove faac dependency; TODO: figure out if we need to do this at all.
epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
+ # Fix missing x265 link flag
+ epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch
+
cd "${S}/gtk"
# Don't run autogen.sh.
sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
@@ -106,8 +111,7 @@ src_configure() {
$(use_enable fdk fdk-aac) \
$(use_enable gtk) \
$(usex !gstreamer --disable-gst) \
- --disable-x265 || die "Configure failed."
- # $(use_enable x265) \
+ $(use_enable x265) || die "Configure failed."
}
src_compile() {
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index dd004ba..8e23f5e 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -9,10 +9,10 @@
Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
</longdescription>
<use>
- <flag name="ffmpeg">Use FFmpeg from <pkg>media-video/ffmpeg</pkg> to decode MPEG-2 instead of <pkg>media-plugins/gst-plugins-mpeg2dec</pkg>.</flag>
<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
<flag name="gtk">Support for Gimp ToolKit + from <pkg>x11-libs/gtk+</pkg>, requirement for a GUI-based HandBrake.</flag>
<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
<flag name="libav-aac">Support for encoding AAC using <pkg>media-libs/libav</pkg>'s internal encoder.</flag>
+ <flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2018-04-20 19:11 Ian Whyman
0 siblings, 0 replies; 8+ messages in thread
From: Ian Whyman @ 2018-04-20 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 5af06626ddac2bdc28d9eeb557a231c0e1ff1b81
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 08:26:19 2018 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 19:11:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af06626
media-video/handbrake: Fixed build with USE="-libav".
Also add xdg_desktop_database_update calls.
Closes: https://bugs.gentoo.org/653254
Package-Manager: Portage-2.3.30, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8065
.../handbrake/files/handbrake-1.1.0-nolibav.patch | 235 +++++++++++++++++++++
media-video/handbrake/handbrake-1.1.0.ebuild | 6 +-
2 files changed, 239 insertions(+), 2 deletions(-)
diff --git a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
new file mode 100644
index 00000000000..bb7e17bdde5
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
@@ -0,0 +1,235 @@
+From 9e1f245708a157231c427c0ef9b91729d59a30e1 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Tue, 28 Nov 2017 08:22:54 -0800
+Subject: [PATCH] add sdtp (sample dependency) box to mp4 (#1006)
+
+* add sdtp (sample dependency) box to mp4
+
+The AppleTV 4K requires this box in order to play 2160p60 video.
+---
+ contrib/ffmpeg/A21-mp4-sdtp.patch | 126 ++++++++++++++++++++++++++++++++++++++
+ libhb/encavcodec.c | 8 ++-
+ libhb/encx264.c | 7 +--
+ libhb/encx265.c | 3 +
+ libhb/muxavformat.c | 4 ++
+ 5 files changed, 140 insertions(+), 8 deletions(-)
+ create mode 100644 contrib/ffmpeg/A21-mp4-sdtp.patch
+
+diff --git a/contrib/ffmpeg/A21-mp4-sdtp.patch b/contrib/ffmpeg/A21-mp4-sdtp.patch
+new file mode 100644
+index 000000000..5d2221c47
+--- /dev/null
++++ b/contrib/ffmpeg/A21-mp4-sdtp.patch
+@@ -0,0 +1,126 @@
++From c2204c579c8411771b53a4bc66324c7c5d07698a Mon Sep 17 00:00:00 2001
++From: John Stebbins <stebbins@jetheaddev.com>
++Date: Thu, 16 Nov 2017 14:40:12 -0800
++Subject: [PATCH] movenc: add sdtp (sample dependency) box to mp4
++
++The AppleTV 4K requires this box in order to play 2160p60 video.
++---
++ libavcodec/avcodec.h | 9 +++++++--
++ libavformat/movenc.c | 34 +++++++++++++++++++++++++++++++++-
++ libavformat/movenc.h | 6 ++++++
++ 3 files changed, 46 insertions(+), 3 deletions(-)
++
++diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
++index 5624835023..48e9d23679 100644
++--- a/libavcodec/avcodec.h
+++++ b/libavcodec/avcodec.h
++@@ -1161,8 +1161,13 @@ typedef struct AVPacket {
++ int64_t convergence_duration;
++ #endif
++ } AVPacket;
++-#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
++-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+++#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
+++#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+++/**
+++ * Flag is used to indicate packets that contain frames that can
+++ * be discarded by the decoder. I.e. Non-reference frames.
+++ */
+++#define AV_PKT_FLAG_DISPOSABLE 0x0004
++
++ enum AVSideDataParamChangeFlags {
++ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
++diff --git a/libavformat/movenc.c b/libavformat/movenc.c
++index a546fdfead..d263f444f4 100644
++--- a/libavformat/movenc.c
+++++ b/libavformat/movenc.c
++@@ -227,6 +227,30 @@ static int mov_write_stss_tag(AVIOContext *pb, MOVTrack *track, uint32_t flag)
++ return update_size(pb, pos);
++ }
++
+++/* Sample dependency atom */
+++static int mov_write_sdtp_tag(AVIOContext *pb, MOVTrack *track)
+++{
+++ int i;
+++ uint8_t leading, dependent, reference, redundancy;
+++ int64_t pos = avio_tell(pb);
+++ avio_wb32(pb, 0); // size
+++ ffio_wfourcc(pb, "sdtp");
+++ avio_wb32(pb, 0); // version & flags
+++ for (i = 0; i < track->entry; i++) {
+++ dependent = MOV_SAMPLE_DEPENDENCY_YES;
+++ leading = reference = redundancy = MOV_SAMPLE_DEPENDENCY_UNKNOWN;
+++ if (track->cluster[i].flags & MOV_DISPOSABLE_SAMPLE) {
+++ reference = MOV_SAMPLE_DEPENDENCY_NO;
+++ }
+++ if (track->cluster[i].flags & MOV_SYNC_SAMPLE) {
+++ dependent = MOV_SAMPLE_DEPENDENCY_NO;
+++ }
+++ avio_w8(pb, (leading << 6) | (dependent << 4) |
+++ (reference << 2) | redundancy);
+++ }
+++ return update_size(pb, pos);
+++}
+++
++ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track)
++ {
++ avio_wb32(pb, 0x11); /* size */
++@@ -1211,8 +1235,12 @@ static int mov_write_stbl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
++ mov_write_stts_tag(pb, track);
++ if ((track->par->codec_type == AVMEDIA_TYPE_VIDEO ||
++ track->par->codec_tag == MKTAG('r','t','p',' ')) &&
++- track->has_keyframes && track->has_keyframes < track->entry)
+++ track->has_keyframes && track->has_keyframes < track->entry) {
++ mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE);
+++ }
+++ if (track->par->codec_type == AVMEDIA_TYPE_VIDEO && track->has_disposable) {
+++ mov_write_sdtp_tag(pb, track);
+++ }
++ if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS)
++ mov_write_stss_tag(pb, track, MOV_PARTIAL_SYNC_SAMPLE);
++ if (track->par->codec_type == AVMEDIA_TYPE_VIDEO &&
++@@ -3647,6 +3675,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
++ if (trk->cluster[trk->entry].flags & MOV_SYNC_SAMPLE)
++ trk->has_keyframes++;
++ }
+++ if (pkt->flags & AV_PKT_FLAG_DISPOSABLE) {
+++ trk->cluster[trk->entry].flags |= MOV_DISPOSABLE_SAMPLE;
+++ trk->has_disposable++;
+++ }
++ trk->entry++;
++ trk->sample_count += samples_in_chunk;
++ mov->mdat_size += size;
++diff --git a/libavformat/movenc.h b/libavformat/movenc.h
++index 008f4671c6..f4eb4e8078 100644
++--- a/libavformat/movenc.h
+++++ b/libavformat/movenc.h
++@@ -51,6 +51,7 @@ typedef struct MOVIentry {
++ int cts;
++ #define MOV_SYNC_SAMPLE 0x0001
++ #define MOV_PARTIAL_SYNC_SAMPLE 0x0002
+++#define MOV_DISPOSABLE_SAMPLE 0x0004
++ uint32_t flags;
++ } MOVIentry;
++
++@@ -85,6 +86,7 @@ typedef struct MOVTrack {
++ long sample_count;
++ long sample_size;
++ int has_keyframes;
+++ int has_disposable;
++ #define MOV_TRACK_CTTS 0x0001
++ #define MOV_TRACK_STPS 0x0002
++ #define MOV_TRACK_ENABLED 0x0004
++@@ -180,6 +182,10 @@ typedef struct MOVMuxContext {
++ int missing_duration_warned;
++ } MOVMuxContext;
++
+++#define MOV_SAMPLE_DEPENDENCY_UNKNOWN 0x0
+++#define MOV_SAMPLE_DEPENDENCY_YES 0x1
+++#define MOV_SAMPLE_DEPENDENCY_NO 0x2
+++
++ #define FF_MOV_FLAG_RTP_HINT (1 << 0)
++ #define FF_MOV_FLAG_FRAGMENT (1 << 1)
++ #define FF_MOV_FLAG_EMPTY_MOOV (1 << 2)
++--
++2.13.6
++
+diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
+index 59d491148..9960a21b4 100644
+--- a/libhb/encavcodec.c
++++ b/libhb/encavcodec.c
+@@ -532,12 +532,14 @@ static void get_packets( hb_work_object_t * w, hb_buffer_list_t * list )
+ out->s.duration = get_frame_duration(pv, frameno);
+ out->s.stop = out->s.stop + out->s.duration;
+ // libav 12 deprecated context->coded_frame, so we can't determine
+- // the exact frame type any more. Luckily for us, we really don't
+- // require it.
++ // the exact frame type any more. So until I can completely
++ // wire up ffmpeg with AV_PKT_DISPOSABLE_FRAME, all frames
++ // must be considered to potentially be reference frames
++ out->s.flags = HB_FLAG_FRAMETYPE_REF;
+ out->s.frametype = 0;
+ if (pkt.flags & AV_PKT_FLAG_KEY)
+ {
+- out->s.flags = HB_FLAG_FRAMETYPE_REF | HB_FLAG_FRAMETYPE_KEY;
++ out->s.flags |= HB_FLAG_FRAMETYPE_KEY;
+ hb_chapter_dequeue(pv->chapter_queue, out);
+ }
+ out = process_delay_list(pv, out);
+diff --git a/libhb/encx264.c b/libhb/encx264.c
+index ce7879ec7..26645213a 100644
+--- a/libhb/encx264.c
++++ b/libhb/encx264.c
+@@ -701,6 +701,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
+ frames we only get the duration of the first which will
+ eventually screw up the muxer & decoder. */
+ int i;
++ buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
+ for( i = 0; i < i_nal; i++ )
+ {
+ int size = nal[i].i_payload;
+@@ -737,11 +738,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
+ * Also, since libx264 doesn't tell us when B-frames are
+ * themselves reference frames, figure it out on our own.
+ */
+- if (nal[i].i_ref_idc == NAL_PRIORITY_DISPOSABLE)
+- {
+- buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
+- }
+- else
++ if (nal[i].i_ref_idc != NAL_PRIORITY_DISPOSABLE)
+ {
+ if (buf->s.frametype == HB_FRAME_B)
+ {
+diff --git a/libhb/encx265.c b/libhb/encx265.c
+index ec7b7d574..242dc6f1f 100644
+--- a/libhb/encx265.c
++++ b/libhb/encx265.c
+@@ -425,16 +425,19 @@ static hb_buffer_t* nal_encode(hb_work_object_t *w,
+ buf->s.frametype = HB_FRAME_IDR;
+ break;
+ case X265_TYPE_P:
++ buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+ buf->s.frametype = HB_FRAME_P;
+ break;
+ case X265_TYPE_B:
+ buf->s.frametype = HB_FRAME_B;
+ break;
+ case X265_TYPE_BREF:
++ buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+ buf->s.frametype = HB_FRAME_BREF;
+ break;
+ case X265_TYPE_I:
+ default:
++ buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+ buf->s.frametype = HB_FRAME_I;
+ break;
+ }
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index f85336dfe..62a270d5b 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -1197,6 +1197,10 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu
+ {
+ pkt.flags |= AV_PKT_FLAG_KEY;
+ }
++ if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF))
++ {
++ pkt.flags |= AV_PKT_FLAG_DISPOSABLE;
++ }
+ }
+ else if (buf->s.frametype & HB_FRAME_MASK_KEY)
+ {
diff --git a/media-video/handbrake/handbrake-1.1.0.ebuild b/media-video/handbrake/handbrake-1.1.0.ebuild
index 4ea9a4d91e3..e5423a88492 100644
--- a/media-video/handbrake/handbrake-1.1.0.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils gnome2-utils python-any-r1
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -99,7 +99,7 @@ src_prepare() {
default
# Get rid of libav specific code when using ffmpeg
- use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+ use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
cd "${S}/gtk"
# Don't run autogen.sh.
@@ -145,6 +145,7 @@ pkg_postinst() {
fi
gnome2_icon_cache_update
+ xdg_desktop_database_update
}
pkg_preinst() {
@@ -153,4 +154,5 @@ pkg_preinst() {
pkg_postrm() {
gnome2_icon_cache_update
+ xdg_desktop_database_update
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2019-11-20 18:24 Ian Whyman
0 siblings, 0 replies; 8+ messages in thread
From: Ian Whyman @ 2019-11-20 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 478aa705b11104a1a067877e02d959ad109a7b25
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 18:23:56 2019 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 18:24:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478aa705
media-video/handbrake: Dont search for python
The ebuild would prefer calling python3 even if the eclass had chosen a
2.7 version, upsetting python_wrapper_setup
Closes: https://bugs.gentoo.org/700706
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
.../handbrake-1.3.0-dont-search-for-python.patch | 27 ++++++++++++++++++++++
...e-1.3.0-r1.ebuild => handbrake-1.3.0-r2.ebuild} | 7 +++---
2 files changed, 30 insertions(+), 4 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
new file mode 100644
index 00000000000..551a64ee381
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 5c870e1d7..2f5834083 100755
+--- a/configure
++++ b/configure
+@@ -14,20 +14,8 @@ inpath()
+ }
+
+ if ( inpath bash ); then
+- pp=""
+- for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
+- do
+- if ( inpath $p ); then
+- pp="$p"
+- break
+- fi
+- done
+- if [ pp != "" ]; then
+- exec $pp `dirname $0`/make/configure.py "$@"
+- exit 0
+- else
+- echo "ERROR: no suitable version of python found."
+- fi
++ exec python `dirname $0`/make/configure.py "$@"
++ exit 0
+ else
+ echo "ERROR: bash shell not found."
+ fi
diff --git a/media-video/handbrake/handbrake-1.3.0-r1.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.3.0-r1.ebuild
rename to media-video/handbrake/handbrake-1.3.0-r2.ebuild
index ddd53059745..21bb95bbbdb 100644
--- a/media-video/handbrake/handbrake-1.3.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -90,11 +90,10 @@ PATCHES=(
# Fix missing flags
"${FILESDIR}/${P}-missing-linker-flags.patch"
-)
-pkg_setup() {
- python-any-r1_pkg_setup
-}
+ # Use whichever python is set by portage
+ "${FILESDIR}/${P}-dont-search-for-python.patch"
+)
src_prepare() {
# Get rid of leftover bundled library build definitions,
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2019-11-20 18:33 Ian Whyman
0 siblings, 0 replies; 8+ messages in thread
From: Ian Whyman @ 2019-11-20 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 4e2f5be328aca632b1ccbc6244c04be904b21a81
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 18:33:04 2019 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 18:33:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2f5be3
media-video/handbrake: Sync/Fix live ebuild
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
media-video/handbrake/files/handbrake-9999-libdl-link.patch | 13 -------------
media-video/handbrake/handbrake-9999.ebuild | 13 +++++--------
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/media-video/handbrake/files/handbrake-9999-libdl-link.patch b/media-video/handbrake/files/handbrake-9999-libdl-link.patch
deleted file mode 100644
index ace1528053a..00000000000
--- a/media-video/handbrake/files/handbrake-9999-libdl-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
-
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
-
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
-
- if test "x$use_fdk_aac" = "xyes" ; then
- HB_LIBS="$HB_LIBS -lfdk-aac"
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 13e3bf9a6ad..cfc362cad18 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
REQUIRED_USE="^^ ( fdk libav-aac )"
@@ -71,7 +71,7 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-2.9:0= )
+ x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
"
DEPEND="${RDEPEND}
@@ -88,14 +88,10 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
- # Fix missing -ldl
- "${FILESDIR}/${PN}-9999-libdl-link.patch"
+ # Use whichever python is set by portage
+ "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
)
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
src_prepare() {
# Get rid of leftover bundled library build definitions,
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
@@ -125,6 +121,7 @@ src_configure() {
$(use_enable fdk fdk-aac) \
$(usex !gtk --disable-gtk) \
$(usex !gstreamer --disable-gst) \
+ $(use_enable numa) \
$(use_enable nvenc) \
$(use_enable x265) || die "Configure failed."
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2020-06-27 9:39 Ian Whyman
0 siblings, 0 replies; 8+ messages in thread
From: Ian Whyman @ 2020-06-27 9:39 UTC (permalink / raw
To: gentoo-commits
commit: de81c6b585f654b688425b8d84801677c4357c57
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 09:38:40 2020 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 09:39:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de81c6b5
media-video/handbrake: Bump, fix x265 link, drop old
Closes: https://bugs.gentoo.org/713598
Closes: https://bugs.gentoo.org/724650
Closes: https://bugs.gentoo.org/724650
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
media-video/handbrake/Manifest | 3 +-
.../handbrake-1.3.0-missing-linker-flags.patch | 27 ----
.../files/handbrake-1.3.2-x265-link.patch | 12 ++
media-video/handbrake/handbrake-1.3.0-r2.ebuild | 170 ---------------------
...ndbrake-1.3.2.ebuild => handbrake-1.3.3.ebuild} | 5 +-
5 files changed, 17 insertions(+), 200 deletions(-)
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index bf3bc269790..abb9a1f6185 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1 @@
-DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
+DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
diff --git a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
deleted file mode 100644
index 598fc7c6efa..00000000000
--- a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
-
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
-
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
-
- if test "x$use_fdk_aac" = "xyes" ; then
- HB_LIBS="$HB_LIBS -lfdk-aac"
-diff --git a/test/module.defs b/test/module.defs
-index ffc00a8b2..62b01ffd5 100644
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
- ifeq (1, $(FEATURE.numa))
- TEST.GCC.l += numa
- endif
-+ifeq (1, $(FEATURE.x265))
-+ TEST.GCC.l += x265
-+endif
- else ifeq ($(HOST.system),kfreebsd)
- TEST.GCC.l += pthread dl m
- else ifeq ($(HOST.system),freebsd)
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
new file mode 100644
index 00000000000..589a204cc19
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
@@ -0,0 +1,12 @@
+diff -Naru a/test/module.defs b/test/module.defs
+--- a/test/module.defs 2020-05-23 17:23:21.912103481 +0200
++++ b/test/module.defs 2020-05-23 17:23:36.106103799 +0200
+@@ -16,7 +16,7 @@
+ TEST.GCC.l = \
+ ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
+ dvdread fribidi \
+- swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
++ swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
+ bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
+
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
deleted file mode 100644
index e7362b5877d..00000000000
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
- inherit git-r3
- KEYWORDS=""
-else
- MY_P="HandBrake-${PV}"
- SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
- app-arch/xz-utils
- media-libs/speex
- dev-libs/jansson
- dev-libs/libxml2
- media-libs/a52dec
- media-libs/libass:=
- >=media-libs/libbluray-1.0
- >=media-libs/dav1d-0.5.1
- media-libs/libdvdnav
- media-libs/libdvdread:=
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- >=media-libs/libvpx-1.8
- nvenc? ( media-libs/nv-codec-headers )
- media-libs/opus
- media-libs/x264:=
- media-sound/lame
- sys-libs/zlib
- >=media-video/ffmpeg-4.2.1:0=[fdk?]
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- media-plugins/gst-plugins-gdkpixbuf:1.0
- )
- gtk? (
- >=x11-libs/gtk+-3.10
- dev-libs/dbus-glib
- dev-libs/glib:2
- dev-libs/libgudev:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- )
- fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/yasm
- dev-util/intltool
- sys-devel/automake"
-
-PATCHES=(
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
- # Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
- # Fix missing flags
- "${FILESDIR}/${P}-missing-linker-flags.patch"
-
- # Use whichever python is set by portage
- "${FILESDIR}/${P}-dont-search-for-python.patch"
-)
-
-src_prepare() {
- # Get rid of leftover bundled library build definitions,
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- default
-
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- # Libav was replaced in 1.2 with ffmpeg by default
- # but I've elected to not make people change their use flags for AAC
- # as its the same code anyway
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- --disable-flatpak \
- --disable-gtk4 \
- $(use_enable libav-aac ffmpeg-aac) \
- $(use_enable fdk fdk-aac) \
- $(usex !gtk --disable-gtk) \
- $(usex !gstreamer --disable-gst) \
- $(use_enable numa) \
- $(use_enable nvenc) \
- $(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
- emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
- einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
- einfo "do not use the bundled (and often patched) upstream libraries."
- einfo ""
- einfo "Please do not raise bugs with upstream because of these ebuilds,"
- einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
- if use gtk ; then
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild b/media-video/handbrake/handbrake-1.3.3.ebuild
similarity index 96%
rename from media-video/handbrake/handbrake-1.3.2.ebuild
rename to media-video/handbrake/handbrake-1.3.3.ebuild
index e5a5b302194..f99cf9d397f 100644
--- a/media-video/handbrake/handbrake-1.3.2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
- >=media-video/ffmpeg-4.2.1:0=[fdk?]
+ >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -89,6 +89,9 @@ PATCHES=(
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+ # Fix x265 linkage... again #724650
+ "${FILESDIR}/${PN}-1.3.2-x265-link.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2021-10-16 1:24 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-10-16 1:24 UTC (permalink / raw
To: gentoo-commits
commit: ff3c488b4c491c2beb5e9ad2e8ffefe43bc2c5f0
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Thu May 20 13:30:56 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 01:23:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3c488b
media-video/handbrake: fix audio encoders with FFmpeg 4.4
Applies the upstream patch:
https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2
Closes: https://bugs.gentoo.org/791220
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/20896
Signed-off-by: Sam James <sam <AT> gentoo.org>
...audio-encoders-when-linking-to-FFmpeg-4.4.patch | 28 ++++
media-video/handbrake/handbrake-1.3.3-r3.ebuild | 165 +++++++++++++++++++++
2 files changed, 193 insertions(+)
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
new file mode 100644
index 00000000000..d7cc565377f
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
@@ -0,0 +1,28 @@
+From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
+From: Damiano Galassi <damiog@gmail.com>
+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/handbrake-1.3.3-r3.ebuild b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
new file mode 100644
index 00000000000..a02d836a04b
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+ inherit git-r3
+else
+ MY_P="HandBrake-${PV}"
+ SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+ app-arch/xz-utils
+ media-libs/speex
+ dev-libs/jansson:=
+ dev-libs/libxml2
+ media-libs/a52dec
+ media-libs/libass:=
+ >=media-libs/libbluray-1.0
+ >=media-libs/dav1d-0.5.1
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ media-libs/libsamplerate
+ media-libs/libtheora
+ media-libs/libvorbis
+ >=media-libs/libvpx-1.8
+ nvenc? ( media-libs/nv-codec-headers )
+ media-libs/opus
+ media-libs/x264:=
+ media-sound/lame
+ sys-libs/zlib
+ >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-a52dec:1.0
+ media-plugins/gst-plugins-libav:1.0
+ media-plugins/gst-plugins-x264:1.0
+ media-plugins/gst-plugins-gdkpixbuf:1.0
+ )
+ gtk? (
+ >=x11-libs/gtk+-3.10
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-libs/libgudev:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libnotify
+ x11-libs/pango
+ )
+ fdk? ( media-libs/fdk-aac )
+ x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/nasm
+ dev-util/intltool"
+
+PATCHES=(
+ # Remove libdvdnav duplication and call it on the original instead.
+ # It may work this way; if not, we should try to mimic the duplication.
+ "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+ # Remove faac dependency; TODO: figure out if we need to do this at all.
+ "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+ # Use whichever python is set by portage
+ "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+ # Fix x265 linkage... again again #730034
+ "${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+
+ # Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
+ "${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
+)
+
+src_prepare() {
+ # Get rid of leftover bundled library build definitions,
+ sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+ "${S}"/make/include/main.defs \
+ || die "Contrib removal failed."
+
+ default
+
+ cd "${S}/gtk"
+ # Don't run autogen.sh.
+ sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+ eautoreconf
+}
+
+src_configure() {
+ # Libav was replaced in 1.2 with ffmpeg by default
+ # but I've elected to not make people change their use flags for AAC
+ # as its the same code anyway
+ ./configure \
+ --force \
+ --verbose \
+ --prefix="${EPREFIX}/usr" \
+ --disable-gtk-update-checks \
+ --disable-flatpak \
+ --disable-gtk4 \
+ $(use_enable libav-aac ffmpeg-aac) \
+ $(use_enable fdk fdk-aac) \
+ $(usex !gtk --disable-gtk) \
+ $(usex !gstreamer --disable-gst) \
+ $(use_enable numa) \
+ $(use_enable nvenc) \
+ $(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+ emake -C build
+
+ # TODO: Documentation building is currently broken, try to fix it.
+ #
+ # if use doc ; then
+ # emake -C build doc
+ # fi
+}
+
+src_install() {
+ emake -C build DESTDIR="${D}" install
+
+ dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+ einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+ einfo "do not use the bundled (and often patched) upstream libraries."
+ einfo ""
+ einfo "Please do not raise bugs with upstream because of these ebuilds,"
+ einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+ einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+ if use gtk ; then
+ einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+ fi
+
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2021-10-24 8:27 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-10-24 8:27 UTC (permalink / raw
To: gentoo-commits
commit: fe3d914b623aa403e90098a23968b394b2f0e6c3
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 24 07:15:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 08:21:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3d914b
media-video/handbrake: add 1.4.2
Closes: https://bugs.gentoo.org/806392
Closes: https://bugs.gentoo.org/738110
Closes: https://bugs.gentoo.org/804891
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/handbrake-9999-system-tools.patch | 24 ++++++++++++++++++++++
media-video/handbrake/handbrake-1.4.2.ebuild | 4 ++++
2 files changed, 28 insertions(+)
diff --git a/media-video/handbrake/files/handbrake-9999-system-tools.patch b/media-video/handbrake/files/handbrake-9999-system-tools.patch
new file mode 100644
index 00000000000..9d76e628ccb
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-system-tools.patch
@@ -0,0 +1,24 @@
+# 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:
+
+ ## create tools in a scope
+ class Tools:
+- ar = ToolProbe( 'AR.exe', 'ar', 'ar', abort=True )
++ ar = ToolProbe( 'AR.exe', 'ar', os.environ.get('AR', 'ar'), abort=True )
+ cp = ToolProbe( 'CP.exe', 'cp', 'cp', abort=True )
+ m4 = ToolProbe( 'M4.exe', 'm4', 'gm4', 'm4', abort=True )
+ mkdir = ToolProbe( 'MKDIR.exe', 'mkdir', 'mkdir', abort=True )
+ patch = ToolProbe( 'PATCH.exe', 'patch', 'gpatch', 'patch', abort=True )
+ rm = ToolProbe( 'RM.exe', 'rm', 'rm', abort=True )
+- ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', 'ranlib', abort=True )
+- strip = ToolProbe( 'STRIP.exe', 'strip', 'strip', abort=True )
++ ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', os.environ.get('RANLIB', 'ranlib'), abort=True )
++ strip = ToolProbe( 'STRIP.exe', 'strip', os.environ.get('STRIP', 'strip'), abort=True )
+ tar = ToolProbe( 'TAR.exe', 'tar', 'gtar', 'tar', abort=True )
+ python = ToolProbe( 'PYTHON.exe', 'python', os.path.basename(sys.executable), abort=True )
+
diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild b/media-video/handbrake/handbrake-1.4.2.ebuild
index 80d947f2777..2978319d46f 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
media-libs/x264:=
+ media-libs/zimg
media-sound/lame
sys-libs/zlib
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
@@ -86,6 +87,9 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+ # Detect system tools - bug 738110
+ "${FILESDIR}/${PN}-9999-system-tools.patch"
+
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
@ 2024-07-05 9:05 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2024-07-05 9:05 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-07-05 9:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-20 19:11 [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/ Ian Whyman
-- strict thread matches above, loose matches on Subject: below --
2024-07-05 9:05 Miroslav Šulc
2021-10-24 8:27 Sam James
2021-10-16 1:24 Sam James
2020-06-27 9:39 Ian Whyman
2019-11-20 18:33 Ian Whyman
2019-11-20 18:24 Ian Whyman
2015-08-09 13:43 Ian Whyman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox