Add more packages for python:3.9 (and 3.10) support

Signed-off-by: Martin Väth <martin@mvath.de>

7 files changed, 329 insertions, 0 deletions

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
new file mode 100644
index 00000000..abb9a1f6
--- /dev/null
+++ b/media-video/handbrake/Manifest
@@ -0,0 +1 @@
+DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
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 00000000..551a64ee
--- /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/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
new file mode 100644
index 00000000..6a146457
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
@@ -0,0 +1,13 @@
+--- a/test/module.defs	2020-06-13 15:05:35.000000000 +0100
++++ a/test/module.defs	2020-07-03 11:15:53.951205608 +0100
+@@ -30,6 +30,10 @@ 
+ endif
+ endif
+ 
++ifeq (1,$(FEATURE.x265))
++    TEST.GCC.l += x265
++endif
++
+ ifeq (1,$(FEATURE.flatpak))
+     TEST.GCC.l += glib-2.0
+ endif
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
new file mode 100644
index 00000000..7dc1f693
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
@@ -0,0 +1,20 @@
+--- a/libhb/dvdnav.c
++++ b/libhb/dvdnav.c
+@@ -1225,16 +1225,7 @@
+                 {
+                     for (kk = 0; kk < buttons; kk++)
+                     {
+-                        dvdnav_t *dvdnav_copy;
+-
+-                        result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
+-                        if (result != DVDNAV_STATUS_OK)
+-                        {
+-                            hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
+-                            goto done;
+-                        }
+-                        title = try_button( dvdnav_copy, kk, list_title );
+-                        dvdnav_free_dup( dvdnav_copy );
++                        title = try_button( d->dvdnav, kk, list_title );
+ 
+                         if ( title >= 0 )
+                         {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
new file mode 100644
index 00000000..7e8ab997
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -0,0 +1,84 @@
+--- 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 << "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"
+@@ -1298,7 +1298,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"
+@@ -1615,7 +1615,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"
+@@ -1732,7 +1732,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"
diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
new file mode 100644
index 00000000..a9b5fdb4
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+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
+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/cmake
+	dev-util/intltool
+	dev-util/meson
+	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"
+
+	# 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"
+)
+
+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
+}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
new file mode 100644
index 00000000..83b12add
--- /dev/null
+++ b/media-video/handbrake/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thev00d00@gentoo.org</email>
+		<name>Ian Whyman</name>
+	</maintainer>
+	<use>
+		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
+		<flag name="gtk">Install the GTK UI, ghb.</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 libav's internal encoder.</flag>
+		<flag name="numa">Adds support for x265's NUMA capabilities.</flag>
+		<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+		<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
+	</use>
+</pkgmetadata>