commit: d09b96ef52113113a42c3b7b51ed8dd858bec4c7 Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> AuthorDate: Sat Nov 16 21:50:22 2019 +0000 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> CommitDate: Sat Nov 16 21:50:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09b96ef
media-video/handbrake: 1.3.0: Fix x265, Add numa Closes: https://bugs.gentoo.org/700098 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> .../handbrake-1.3.0-missing-linker-flags.patch | 27 ++++++++++++++++++++++ ...handbrake-9999-fix-missing-x265-link-flag.patch | 13 ----------- ...rake-1.3.0.ebuild => handbrake-1.3.0-r1.ebuild} | 9 ++++---- media-video/handbrake/metadata.xml | 1 + 4 files changed, 33 insertions(+), 17 deletions(-) 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 new file mode 100644 index 00000000000..598fc7c6efa --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch @@ -0,0 +1,27 @@ +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-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch deleted file mode 100644 index a963fe0af21..00000000000 --- a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch +++ /dev/null @@ -1,13 +0,0 @@ -Written by: Peter Foley <pefol...@pefoley.com> -Gentoo Bug: #552792 - ---- a/test/module.defs -+++ b/test/module.defs -@@ -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/handbrake-1.3.0.ebuild b/media-video/handbrake/handbrake-1.3.0-r1.ebuild similarity index 95% rename from media-video/handbrake/handbrake-1.3.0.ebuild rename to media-video/handbrake/handbrake-1.3.0-r1.ebuild index 13e3bf9a6ad..ddd53059745 100644 --- a/media-video/handbrake/handbrake-1.3.0.ebuild +++ b/media-video/handbrake/handbrake-1.3.0-r1.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,8 +88,8 @@ 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" + # Fix missing flags + "${FILESDIR}/${P}-missing-linker-flags.patch" ) pkg_setup() { @@ -125,6 +125,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." } diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml index 0bab35dd0f0..66de5356243 100644 --- a/media-video/handbrake/metadata.xml +++ b/media-video/handbrake/metadata.xml @@ -13,6 +13,7 @@ <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 <pkg>media-video/libav</pkg>'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>
