[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
commit: 0e71cefa9cdbb19d722c823448df7b9e186164b8 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Feb 7 06:25:19 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Feb 9 23:01:46 2022 + 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 levelnine.at> Signed-off-by: Conrad Kostecki 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.. --- 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 -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.. --- 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 <<
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: fe3d914b623aa403e90098a23968b394b2f0e6c3 Author: James Beddek posteo de> AuthorDate: Sun Oct 24 07:15:28 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 24 08:21:42 2021 + 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 posteo.de> Signed-off-by: Sam James gentoo.org> .../files/handbrake--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--system-tools.patch b/media-video/handbrake/files/handbrake--system-tools.patch new file mode 100644 index 000..9d76e628ccb --- /dev/null +++ b/media-video/handbrake/files/handbrake--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}--remove-faac-dependency.patch" + # Detect system tools - bug 738110 + "${FILESDIR}/${PN}--system-tools.patch" + # Use whichever python is set by portage "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: ff3c488b4c491c2beb5e9ad2e8ffefe43bc2c5f0 Author: Matthew White inventati org> AuthorDate: Thu May 20 13:30:56 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 16 01:23:55 2021 + 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 inventati.org> Closes: https://github.com/gentoo/gentoo/pull/20896 Signed-off-by: Sam James 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 000..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 +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 000..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} = ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
commit: 90df404c0b5d87b409245a35464e0e708479e73e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Jul 12 18:14:32 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jul 13 21:14:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90df404c media-video/handbrake: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/21615 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> media-video/handbrake/files/handbrake-1.3.2-x265-link.patch | 12 1 file changed, 12 deletions(-) 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 deleted file mode 100644 index 589a204cc19..000 --- a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -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))
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: de81c6b585f654b688425b8d84801677c4357c57 Author: Ian Whyman gentoo org> AuthorDate: Sat Jun 27 09:38:40 2020 + Commit: Ian Whyman gentoo org> CommitDate: Sat Jun 27 09:39:05 2020 + 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 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..000 --- 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 000..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..000 --- 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=(
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: 4e2f5be328aca632b1ccbc6244c04be904b21a81 Author: Ian Whyman gentoo org> AuthorDate: Wed Nov 20 18:33:04 2019 + Commit: Ian Whyman gentoo org> CommitDate: Wed Nov 20 18:33:08 2019 + 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 gentoo.org> media-video/handbrake/files/handbrake--libdl-link.patch | 13 - media-video/handbrake/handbrake-.ebuild | 13 + 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/media-video/handbrake/files/handbrake--libdl-link.patch b/media-video/handbrake/files/handbrake--libdl-link.patch deleted file mode 100644 index ace1528053a..000 --- a/media-video/handbrake/files/handbrake--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-.ebuild b/media-video/handbrake/handbrake-.ebuild index 13e3bf9a6ad..cfc362cad18 100644 --- a/media-video/handbrake/handbrake-.ebuild +++ b/media-video/handbrake/handbrake-.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}--remove-faac-dependency.patch" - # Fix missing -ldl - "${FILESDIR}/${PN}--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." }
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: 478aa705b11104a1a067877e02d959ad109a7b25 Author: Ian Whyman gentoo org> AuthorDate: Wed Nov 20 18:23:56 2019 + Commit: Ian Whyman gentoo org> CommitDate: Wed Nov 20 18:24:16 2019 + 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 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 000..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,
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
commit: b1f81c470cb6e81ded3f8acc6a21fbd913678e73 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Mar 2 11:58:15 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 4 03:11:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f81c47 media-video/handbrake: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11212 Signed-off-by: Aaron Bauman gentoo.org> .../handbrake/files/handbrake-0.10.3-nolibav.patch | 76 -- 1 file changed, 76 deletions(-) diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch deleted file mode 100644 index 8539186aaa5..000 --- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001 -From: John Stebbins -Date: Tue, 3 Nov 2015 10:16:01 -0800 -Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling - -diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c -index 0d70597..373c2ab 100644 a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m ) - hb_mux_data_t * track; - int meta_mux; - int max_tracks; --int ii, ret; -+int ii, jj, ret; - - int clock_min, clock_max, clock; - hb_video_framerate_get_limits(_min, _max, ); -@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m ) - } - } - -+// Check for audio track associations -+for (ii = 0; ii < hb_list_count(job->list_audio); ii++) -+{ -+audio = hb_list_item(job->list_audio, ii); -+switch (audio->config.out.codec & HB_ACODEC_MASK) -+{ -+case HB_ACODEC_FFAAC: -+case HB_ACODEC_CA_AAC: -+case HB_ACODEC_CA_HAAC: -+case HB_ACODEC_FDK_AAC: -+case HB_ACODEC_FDK_HAAC: -+break; -+ -+default: -+{ -+// Mark associated fallback audio tracks for any non-aac track -+for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ ) -+{ -+hb_audio_t* fallback; -+int codec; -+ -+if (ii == jj) continue; -+ -+fallback = hb_list_item( job->list_audio, jj ); -+codec = fallback->config.out.codec & HB_ACODEC_MASK; -+if (fallback->config.in.track == audio->config.in.track && -+(codec == HB_ACODEC_FFAAC || -+ codec == HB_ACODEC_CA_AAC || -+ codec == HB_ACODEC_CA_HAAC || -+ codec == HB_ACODEC_FDK_AAC || -+ codec == HB_ACODEC_FDK_HAAC)) -+{ -+hb_mux_data_t * fallback_track; -+int * sd; -+ -+track = audio->priv.mux_data; -+fallback_track = fallback->priv.mux_data; -+sd = (int*)av_stream_new_side_data(track->st, -+ AV_PKT_DATA_FALLBACK_TRACK, -+ sizeof(int)); -+if (sd != NULL) -+{ -+*sd = fallback_track->st->index; -+} -+} -+} -+} break; -+} -+} -+ - char * subidx_fmt = - "size: %dx%d\n" - "org: %d, %d\n"
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: 5af06626ddac2bdc28d9eeb557a231c0e1ff1b81 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 19 08:26:19 2018 + Commit: Ian Whyman gentoo org> CommitDate: Fri Apr 20 19:11:14 2018 + 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 000..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+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 0..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 ++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 &&
[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/
commit: b8f141afeb0e183298fe227672ac9338e0e8e12c Author: Ian Whyman thev00d00 AT gentoo DOT org AuthorDate: Sun Aug 9 12:30:22 2015 + Commit: Ian Whyman thev00d00 AT gentoo DOT org CommitDate: Sun Aug 9 13:43:25 2015 + 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--expand-MK_SUBTITLE_PGS.patch| 9 - ...ke--fix-compilation-with-mp4v2-v1.9.1.patch | 75 ...handbrake--fix-missing-x265-link-flag.patch | 13 ++ .../files/handbrake--use-older-libmkv.patch| 14 -- .../files/handbrake--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-.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..000 --- 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..000 --- 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?= rbr...@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 rbr...@ime.usp.br -Signed-off-by: Rogério Theodoro de Brito rbr...@ime.usp.br