Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Ian Whyman <thev00d00@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/
Date: Sat, 27 Jun 2020 09:39:19
Message-Id: 1593250744.927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3.thev00d00@gentoo
1 commit: 927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3
2 Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 27 08:17:05 2020 +0000
4 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 27 09:39:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927f4ed4
7
8 media-video/handbrake: Tidy old
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
12
13 media-video/handbrake/Manifest | 1 -
14 ...ndbrake-1.2.2-backport-hardware-configure.patch | 88 -----------
15 ...andbrake-1.2.2-fix-missing-x265-link-flag.patch | 13 --
16 media-video/handbrake/handbrake-1.2.2-r3.ebuild | 168 ---------------------
17 4 files changed, 270 deletions(-)
18
19 diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
20 index 70dab8d3bfb..bf3bc269790 100644
21 --- a/media-video/handbrake/Manifest
22 +++ b/media-video/handbrake/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
25 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
26 DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
27
28 diff --git a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
29 deleted file mode 100644
30 index 0618c9004e9..00000000000
31 --- a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
32 +++ /dev/null
33 @@ -1,88 +0,0 @@
34 -From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001
35 -From: Bradley Sepos <bradley@××××××××××××.com>
36 -Date: Sat, 23 Feb 2019 11:44:34 -0500
37 -Subject: [PATCH] configure: Enable hardware encoders by default on suitable
38 - platforms.
39 -
40 -Print special encoders status at end of configure output, minor cosmetics.
41 ----
42 - make/configure.py | 46 +++++++++++++++++++++++++++++-----------------
43 - 1 file changed, 29 insertions(+), 17 deletions(-)
44 -
45 -diff --git a/make/configure.py b/make/configure.py
46 -index c8bc712fe5..e673c9c5a0 100644
47 ---- a/make/configure.py
48 -+++ b/make/configure.py
49 -@@ -1298,36 +1298,37 @@ def createCLI():
50 - grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
51 -
52 - h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
53 --
54 - grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
55 -
56 - h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
57 - grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
58 -
59 - h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
60 --
61 - grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
62 -
63 -- h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
64 -- grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
65 -+ h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
66 -+ grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
67 -+ grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
68 -
69 -- h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
70 -- grp.add_option( '--enable-vce', default=False, action='store_true', help=h )
71 -+ h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
72 -+ grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
73 -+ grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
74 -
75 -- h = IfHost( 'enable x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
76 -- grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=h )
77 -- grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' )
78 -+ h = IfHost( 'x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
79 -+ grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
80 -+ grp.add_option( '--disable-x265', dest="enable_x265", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
81 -
82 -- h = IfHost( 'enable FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
83 -- grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=h )
84 -- grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' )
85 -+ h = IfHost( 'FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
86 -+ grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
87 -+ grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
88 -
89 -- h = IfHost( 'enable FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
90 -- grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
91 -- grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
92 -+ h = IfHost( 'FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
93 -+ grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
94 -+ grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
95 -
96 -- h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
97 -- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
98 -+ h = IfHost( 'Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
99 -+ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
100 -+ grp.add_option( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
101 -
102 -
103 - cli.add_option_group( grp )
104 -@@ -1982,6 +1983,17 @@ class Tools:
105 - else:
106 - nocd = False
107 -
108 -+ stdout.write( '%s\n' % ('-' * 79) )
109 -+ stdout.write( 'Configured options:\n' )
110 -+ stdout.write( 'Enable FDK-AAC: %s\n' % options.enable_fdk_aac )
111 -+ stdout.write( 'Enable FFmpeg AAC: %s\n' % options.enable_ffmpeg_aac )
112 -+
113 -+ if IfHost( True, '*-*-linux*', '*-*-mingw*', none=False ).value is True:
114 -+ stdout.write( 'Enable NVEnc: %s\n' % options.enable_nvenc )
115 -+ stdout.write( 'Enable QSV: %s\n' % options.enable_qsv )
116 -+ if IfHost( True, '*-*-mingw*', none=False ).value is True:
117 -+ stdout.write( 'Enable VCE: %s\n' % options.enable_vce )
118 -+
119 - stdout.write( '%s\n' % ('-' * 79) )
120 - if options.launch:
121 - stdout.write( 'Build is finished!\n' )
122
123 diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
124 deleted file mode 100644
125 index a999fc32564..00000000000
126 --- a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
127 +++ /dev/null
128 @@ -1,13 +0,0 @@
129 -Written by: Peter Foley <pefoley2@×××××××.com>
130 -Gentoo Bug: #552792
131 -
132 ---- ./test/module.defs.bak 2015-06-21 13:19:40.626249439 -0400
133 -+++ ./test/module.defs 2015-06-21 13:19:54.919757726 -0400
134 -@@ -25,6 +25,7 @@
135 -
136 - ifeq (1,$(FEATURE.x265))
137 - TEST.GCC.D += USE_X265
138 -+ TEST.GCC.l += x265
139 - endif
140 -
141 - TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
142
143 diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
144 deleted file mode 100644
145 index 723f649b7e2..00000000000
146 --- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
147 +++ /dev/null
148 @@ -1,168 +0,0 @@
149 -# Copyright 1999-2020 Gentoo Authors
150 -# Distributed under the terms of the GNU General Public License v2
151 -
152 -EAPI=6
153 -
154 -PYTHON_COMPAT=( python2_7 )
155 -
156 -inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
157 -
158 -if [[ ${PV} = *9999* ]]; then
159 - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
160 - inherit git-r3
161 - KEYWORDS=""
162 -else
163 - MY_P="HandBrake-${PV}"
164 - SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
165 - S="${WORKDIR}/${MY_P}"
166 - KEYWORDS="~amd64 ~x86"
167 -fi
168 -
169 -DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
170 -HOMEPAGE="http://handbrake.fr/"
171 -LICENSE="GPL-2"
172 -
173 -SLOT="0"
174 -IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
175 -
176 -REQUIRED_USE="^^ ( fdk libav-aac )"
177 -
178 -RDEPEND="
179 - app-arch/xz-utils
180 - media-libs/speex
181 - dev-libs/jansson
182 - media-libs/a52dec
183 - media-libs/libass:=
184 - >=media-libs/libbluray-1.0
185 - media-libs/libdvdnav
186 - media-libs/libdvdread
187 - media-libs/libsamplerate
188 - media-libs/libtheora
189 - media-libs/libvorbis
190 - media-libs/libvpx
191 - nvenc? ( media-libs/nv-codec-headers )
192 - media-libs/opus
193 - media-libs/x264:=
194 - media-sound/lame
195 - sys-libs/zlib
196 - >=media-video/ffmpeg-4.1:0=[fdk?]
197 - gstreamer? (
198 - media-libs/gstreamer:1.0
199 - media-libs/gst-plugins-base:1.0
200 - media-libs/gst-plugins-good:1.0
201 - media-libs/gst-plugins-bad:1.0
202 - media-libs/gst-plugins-ugly:1.0
203 - media-plugins/gst-plugins-a52dec:1.0
204 - media-plugins/gst-plugins-libav:1.0
205 - media-plugins/gst-plugins-x264:1.0
206 - )
207 - gtk? (
208 - >=x11-libs/gtk+-3.10
209 - dev-libs/dbus-glib
210 - dev-libs/glib:2
211 - dev-libs/libgudev:=
212 - x11-libs/cairo
213 - x11-libs/gdk-pixbuf:2
214 - x11-libs/libnotify
215 - x11-libs/pango
216 - )
217 - fdk? ( media-libs/fdk-aac )
218 - x265? ( >=media-libs/x265-2.9:0= )
219 - "
220 -
221 -DEPEND="${RDEPEND}
222 - ${PYTHON_DEPS}
223 - dev-lang/yasm
224 - dev-util/intltool
225 - sys-devel/automake"
226 -
227 -PATCHES=(
228 - # Remove libdvdnav duplication and call it on the original instead.
229 - # It may work this way; if not, we should try to mimic the duplication.
230 - "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
231 -
232 - # Remove faac dependency; TODO: figure out if we need to do this at all.
233 - "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
234 -
235 - # Fix missing x265 link flag
236 - "${FILESDIR}/${P}-fix-missing-x265-link-flag.patch"
237 -
238 - # Allow disabling nvenc etc
239 - "${FILESDIR}/${P}-backport-hardware-configure.patch"
240 -)
241 -
242 -pkg_setup() {
243 - python-any-r1_pkg_setup
244 -}
245 -
246 -src_prepare() {
247 - # Get rid of leftover bundled library build definitions,
248 - sed -i 's:.*\(/contrib\|contrib/\).*::g' \
249 - "${S}"/make/include/main.defs \
250 - || die "Contrib removal failed."
251 -
252 - default
253 -
254 - cd "${S}/gtk"
255 - # Don't run autogen.sh.
256 - sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
257 - eautoreconf
258 -}
259 -
260 -src_configure() {
261 - # Libav was replaced in 1.2 with ffmpeg by default
262 - # but I've elected to not make people change their use flags for AAC
263 - # as its the same code anyway
264 - ./configure \
265 - --force \
266 - --verbose \
267 - --prefix="${EPREFIX}/usr" \
268 - --disable-gtk-update-checks \
269 - $(use_enable libav-aac ffmpeg-aac) \
270 - $(use_enable fdk fdk-aac) \
271 - $(use_enable gtk) \
272 - $(usex !gstreamer --disable-gst) \
273 - $(use_enable nvenc) \
274 - $(use_enable x265) || die "Configure failed."
275 -}
276 -
277 -src_compile() {
278 - emake -C build
279 -
280 - # TODO: Documentation building is currently broken, try to fix it.
281 - #
282 - # if use doc ; then
283 - # emake -C build doc
284 - # fi
285 -}
286 -
287 -src_install() {
288 - emake -C build DESTDIR="${D}" install
289 -
290 - dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
291 -}
292 -
293 -pkg_postinst() {
294 - einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
295 - einfo "do not use the bundled (and often patched) upstream libraries."
296 - einfo ""
297 - einfo "Please do not raise bugs with upstream because of these ebuilds,"
298 - einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
299 -
300 - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
301 - if use gtk ; then
302 - einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
303 - fi
304 -
305 - gnome2_icon_cache_update
306 - xdg_desktop_database_update
307 -}
308 -
309 -pkg_preinst() {
310 - gnome2_icon_savelist
311 -}
312 -
313 -pkg_postrm() {
314 - gnome2_icon_cache_update
315 - xdg_desktop_database_update
316 -}
Report Message
Find on MARC Find on Google Groups