1 |
commit: d09b96ef52113113a42c3b7b51ed8dd858bec4c7 |
2 |
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 16 21:50:22 2019 +0000 |
4 |
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 16 21:50:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09b96ef |
7 |
|
8 |
media-video/handbrake: 1.3.0: Fix x265, Add numa |
9 |
|
10 |
Closes: https://bugs.gentoo.org/700098 |
11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
12 |
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> |
13 |
|
14 |
.../handbrake-1.3.0-missing-linker-flags.patch | 27 ++++++++++++++++++++++ |
15 |
...handbrake-9999-fix-missing-x265-link-flag.patch | 13 ----------- |
16 |
...rake-1.3.0.ebuild => handbrake-1.3.0-r1.ebuild} | 9 ++++---- |
17 |
media-video/handbrake/metadata.xml | 1 + |
18 |
4 files changed, 33 insertions(+), 17 deletions(-) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 00000000000..598fc7c6efa |
23 |
--- /dev/null |
24 |
+++ b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch |
25 |
@@ -0,0 +1,27 @@ |
26 |
+diff --git a/gtk/configure.ac b/gtk/configure.ac |
27 |
+index 92aabcbe8..1f4a1df95 100644 |
28 |
+--- a/gtk/configure.ac |
29 |
++++ b/gtk/configure.ac |
30 |
+@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES]) |
31 |
+ |
32 |
+ GHB_CFLAGS="$HBINC $GHB_CFLAGS" |
33 |
+ |
34 |
+-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" |
35 |
++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" |
36 |
+ |
37 |
+ if test "x$use_fdk_aac" = "xyes" ; then |
38 |
+ HB_LIBS="$HB_LIBS -lfdk-aac" |
39 |
+diff --git a/test/module.defs b/test/module.defs |
40 |
+index ffc00a8b2..62b01ffd5 100644 |
41 |
+--- a/test/module.defs |
42 |
++++ b/test/module.defs |
43 |
+@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux) |
44 |
+ ifeq (1, $(FEATURE.numa)) |
45 |
+ TEST.GCC.l += numa |
46 |
+ endif |
47 |
++ifeq (1, $(FEATURE.x265)) |
48 |
++ TEST.GCC.l += x265 |
49 |
++endif |
50 |
+ else ifeq ($(HOST.system),kfreebsd) |
51 |
+ TEST.GCC.l += pthread dl m |
52 |
+ else ifeq ($(HOST.system),freebsd) |
53 |
|
54 |
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 |
55 |
deleted file mode 100644 |
56 |
index a963fe0af21..00000000000 |
57 |
--- a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch |
58 |
+++ /dev/null |
59 |
@@ -1,13 +0,0 @@ |
60 |
-Written by: Peter Foley <pefoley2@×××××××.com> |
61 |
-Gentoo Bug: #552792 |
62 |
- |
63 |
---- a/test/module.defs |
64 |
-+++ b/test/module.defs |
65 |
-@@ -25,6 +25,7 @@ |
66 |
- |
67 |
- ifeq (1,$(FEATURE.x265)) |
68 |
- TEST.GCC.D += USE_X265 |
69 |
-+ TEST.GCC.l += x265 |
70 |
- endif |
71 |
- |
72 |
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs)) |
73 |
|
74 |
diff --git a/media-video/handbrake/handbrake-1.3.0.ebuild b/media-video/handbrake/handbrake-1.3.0-r1.ebuild |
75 |
similarity index 95% |
76 |
rename from media-video/handbrake/handbrake-1.3.0.ebuild |
77 |
rename to media-video/handbrake/handbrake-1.3.0-r1.ebuild |
78 |
index 13e3bf9a6ad..ddd53059745 100644 |
79 |
--- a/media-video/handbrake/handbrake-1.3.0.ebuild |
80 |
+++ b/media-video/handbrake/handbrake-1.3.0-r1.ebuild |
81 |
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/" |
82 |
LICENSE="GPL-2" |
83 |
|
84 |
SLOT="0" |
85 |
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265" |
86 |
+IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265" |
87 |
|
88 |
REQUIRED_USE="^^ ( fdk libav-aac )" |
89 |
|
90 |
@@ -71,7 +71,7 @@ RDEPEND=" |
91 |
x11-libs/pango |
92 |
) |
93 |
fdk? ( media-libs/fdk-aac ) |
94 |
- x265? ( >=media-libs/x265-2.9:0= ) |
95 |
+ x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) |
96 |
" |
97 |
|
98 |
DEPEND="${RDEPEND} |
99 |
@@ -88,8 +88,8 @@ PATCHES=( |
100 |
# Remove faac dependency; TODO: figure out if we need to do this at all. |
101 |
"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" |
102 |
|
103 |
- # Fix missing -ldl |
104 |
- "${FILESDIR}/${PN}-9999-libdl-link.patch" |
105 |
+ # Fix missing flags |
106 |
+ "${FILESDIR}/${P}-missing-linker-flags.patch" |
107 |
) |
108 |
|
109 |
pkg_setup() { |
110 |
@@ -125,6 +125,7 @@ src_configure() { |
111 |
$(use_enable fdk fdk-aac) \ |
112 |
$(usex !gtk --disable-gtk) \ |
113 |
$(usex !gstreamer --disable-gst) \ |
114 |
+ $(use_enable numa) \ |
115 |
$(use_enable nvenc) \ |
116 |
$(use_enable x265) || die "Configure failed." |
117 |
} |
118 |
|
119 |
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml |
120 |
index 0bab35dd0f0..66de5356243 100644 |
121 |
--- a/media-video/handbrake/metadata.xml |
122 |
+++ b/media-video/handbrake/metadata.xml |
123 |
@@ -13,6 +13,7 @@ |
124 |
<flag name="gtk">Install the GTK UI, ghb.</flag> |
125 |
<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag> |
126 |
<flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag> |
127 |
+ <flag name="numa">Adds support for x265's NUMA capabilities.</flag> |
128 |
<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag> |
129 |
<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag> |
130 |
</use> |