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 <[email protected]> +Date: Sat, 10 Apr 2021 13:18:02 +0200 +Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4. + +--- + libhb/encavcodecaudio.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c +index 52fc4565d..e6cf42414 100644 +--- a/libhb/encavcodecaudio.c ++++ b/libhb/encavcodecaudio.c +@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list) + + // Prepare input frame + int out_size; +- AVFrame frame = { .nb_samples = pv->samples_per_frame, }; ++ AVFrame frame = { .nb_samples = pv->samples_per_frame, ++ .format = pv->context->sample_fmt, ++ .channels = pv->context->channels ++ }; + + out_size = av_samples_get_buffer_size(NULL, + pv->context->channels, +-- +2.26.3 + diff --git a/media-video/handbrake/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 +}
