Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date: Wed, 04 Sep 2019 08:46:57
Message-Id: 1567586805.3e0f9b51e48e2b964913db6c062842df4c3bb803.polynomial-c@gentoo
1 commit: 3e0f9b51e48e2b964913db6c062842df4c3bb803
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 4 08:46:35 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 4 08:46:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0f9b51
7
8 media-video/vlc: Security cleanup
9
10 Bug: https://bugs.gentoo.org/689974
11 Package-Manager: Portage-2.3.75, Repoman-2.3.17
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 media-video/vlc/Manifest | 1 -
15 media-video/vlc/vlc-3.0.7.1.ebuild | 494 -------------------------------------
16 2 files changed, 495 deletions(-)
17
18 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
19 index 560a1b27b4b..2fab826131e 100644
20 --- a/media-video/vlc/Manifest
21 +++ b/media-video/vlc/Manifest
22 @@ -1,2 +1 @@
23 -DIST vlc-3.0.7.1.tar.xz 26052372 BLAKE2B 349e967ff00db2fd5ea1a62deb12009ff0d85c56a82774aa4fedf7bffecd21b0c8c745f41eb4b9b4d36aaddcce95e79146901f318d18eab99f08e347841a8008 SHA512 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd
24 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
25
26 diff --git a/media-video/vlc/vlc-3.0.7.1.ebuild b/media-video/vlc/vlc-3.0.7.1.ebuild
27 deleted file mode 100644
28 index 52a230d3d17..00000000000
29 --- a/media-video/vlc/vlc-3.0.7.1.ebuild
30 +++ /dev/null
31 @@ -1,494 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -MY_PV="${PV/_/-}"
38 -MY_PV="${MY_PV/-beta/-test}"
39 -MY_P="${PN}-${MY_PV}"
40 -if [[ ${PV} = *9999 ]] ; then
41 - if [[ ${PV%.9999} != ${PV} ]] ; then
42 - EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
43 - else
44 - EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
45 - fi
46 - inherit git-r3
47 -else
48 - if [[ ${MY_P} = ${P} ]] ; then
49 - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
50 - else
51 - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
52 - fi
53 - KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
54 -fi
55 -inherit autotools flag-o-matic toolchain-funcs virtualx xdg
56 -
57 -DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
58 -HOMEPAGE="https://www.videolan.org/vlc/"
59 -
60 -LICENSE="LGPL-2.1 GPL-2"
61 -SLOT="0/5-9" # vlc - vlccore
62 -
63 -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
64 - dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
65 - fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
66 - libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
67 - live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
68 - neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
69 - +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
70 - svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
71 - wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
72 -"
73 -REQUIRED_USE="
74 - chromecast? ( encode )
75 - directx? ( ffmpeg )
76 - fontconfig? ( truetype )
77 - libcaca? ( X )
78 - libtar? ( skins )
79 - libtiger? ( kate )
80 - postproc? ( ffmpeg )
81 - skins? ( qt5 truetype X xml )
82 - ssl? ( gcrypt )
83 - vaapi? ( ffmpeg X )
84 - vdpau? ( ffmpeg X )
85 -"
86 -BDEPEND="
87 - >=sys-devel/gettext-0.19.8
88 - virtual/pkgconfig
89 - amd64? ( dev-lang/yasm )
90 - x86? ( dev-lang/yasm )
91 -"
92 -RDEPEND="
93 - net-dns/libidn:=
94 - sys-libs/zlib[minizip]
95 - virtual/libintl
96 - virtual/opengl
97 - a52? ( media-libs/a52dec )
98 - alsa? ( media-libs/alsa-lib )
99 - aom? ( media-libs/libaom:= )
100 - archive? ( app-arch/libarchive:= )
101 - aribsub? ( media-libs/aribb24 )
102 - bidi? (
103 - dev-libs/fribidi
104 - media-libs/freetype:2[harfbuzz]
105 - media-libs/harfbuzz
106 - virtual/ttf-fonts
107 - )
108 - bluray? ( media-libs/libbluray:= )
109 - cddb? ( media-libs/libcddb )
110 - chromaprint? ( media-libs/chromaprint:= )
111 - chromecast? (
112 - >=dev-libs/protobuf-2.5.0:=
113 - >=net-libs/libmicrodns-0.0.9:=
114 - )
115 - dav1d? ( media-libs/dav1d )
116 - dbus? ( sys-apps/dbus )
117 - dc1394? (
118 - media-libs/libdc1394:2
119 - sys-libs/libraw1394
120 - )
121 - dts? ( media-libs/libdca )
122 - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
123 - dvd? (
124 - >=media-libs/libdvdnav-4.9
125 - >=media-libs/libdvdread-4.9
126 - )
127 - faad? ( media-libs/faad2 )
128 - fdk? ( media-libs/fdk-aac:= )
129 - ffmpeg? (
130 - !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
131 - libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
132 - )
133 - flac? (
134 - media-libs/flac
135 - media-libs/libogg
136 - )
137 - fluidsynth? ( media-sound/fluidsynth:= )
138 - fontconfig? ( media-libs/fontconfig:1.0 )
139 - gcrypt? (
140 - dev-libs/libgcrypt:0=
141 - dev-libs/libgpg-error
142 - )
143 - gme? ( media-libs/game-music-emu )
144 - gnome-keyring? ( app-crypt/libsecret )
145 - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
146 - ieee1394? (
147 - sys-libs/libavc1394
148 - sys-libs/libraw1394
149 - )
150 - jack? ( virtual/jack )
151 - jpeg? ( virtual/jpeg:0 )
152 - kate? ( media-libs/libkate )
153 - libass? (
154 - media-libs/fontconfig:1.0
155 - media-libs/libass:=
156 - )
157 - libcaca? ( media-libs/libcaca )
158 - libnotify? (
159 - dev-libs/glib:2
160 - x11-libs/gdk-pixbuf:2
161 - x11-libs/gtk+:3
162 - x11-libs/libnotify
163 - )
164 - libsamplerate? ( media-libs/libsamplerate )
165 - libtar? ( dev-libs/libtar )
166 - libtiger? ( media-libs/libtiger )
167 - linsys? ( media-libs/zvbi )
168 - lirc? ( app-misc/lirc )
169 - live? ( media-plugins/live:= )
170 - lua? ( >=dev-lang/lua-5.1:0= )
171 - mad? ( media-libs/libmad )
172 - matroska? (
173 - dev-libs/libebml:=
174 - media-libs/libmatroska:=
175 - )
176 - modplug? ( media-libs/libmodplug )
177 - mp3? ( media-sound/mpg123 )
178 - mpeg? ( media-libs/libmpeg2 )
179 - mtp? ( media-libs/libmtp:= )
180 - musepack? ( media-sound/musepack-tools )
181 - ncurses? ( sys-libs/ncurses:0=[unicode] )
182 - nfs? ( >=net-fs/libnfs-0.10.0:= )
183 - ogg? ( media-libs/libogg )
184 - opencv? ( media-libs/opencv:= )
185 - opus? ( >=media-libs/opus-1.0.3 )
186 - png? ( media-libs/libpng:0= )
187 - postproc? ( libav? ( media-libs/libpostproc ) )
188 - projectm? (
189 - media-fonts/dejavu
190 - media-libs/libprojectm
191 - )
192 - pulseaudio? ( media-sound/pulseaudio )
193 - qt5? (
194 - dev-qt/qtcore:5
195 - dev-qt/qtgui:5
196 - dev-qt/qtsvg:5
197 - dev-qt/qtwidgets:5
198 - X? (
199 - dev-qt/qtx11extras:5
200 - x11-libs/libX11
201 - )
202 - )
203 - rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
204 - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
205 - sdl-image? ( media-libs/sdl-image )
206 - sftp? ( net-libs/libssh2 )
207 - shout? ( media-libs/libshout )
208 - sid? ( media-libs/libsidplay:2 )
209 - skins? (
210 - x11-libs/libXext
211 - x11-libs/libXinerama
212 - x11-libs/libXpm
213 - )
214 - soxr? ( >=media-libs/soxr-0.1.2 )
215 - speex? (
216 - >=media-libs/speex-1.2.0
217 - media-libs/speexdsp
218 - )
219 - srt? ( net-libs/srt )
220 - ssl? ( net-libs/gnutls:= )
221 - svg? (
222 - gnome-base/librsvg:2
223 - x11-libs/cairo
224 - )
225 - taglib? ( >=media-libs/taglib-1.9 )
226 - theora? ( media-libs/libtheora )
227 - tremor? ( media-libs/tremor )
228 - truetype? (
229 - media-libs/freetype:2
230 - virtual/ttf-fonts
231 - !fontconfig? ( media-fonts/dejavu )
232 - )
233 - twolame? ( media-sound/twolame )
234 - udev? ( virtual/udev )
235 - upnp? ( net-libs/libupnp:= )
236 - v4l? ( media-libs/libv4l:= )
237 - vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
238 - vdpau? ( x11-libs/libvdpau )
239 - vnc? ( net-libs/libvncserver )
240 - vorbis? ( media-libs/libvorbis )
241 - vpx? ( media-libs/libvpx:= )
242 - wayland? (
243 - >=dev-libs/wayland-1.15
244 - dev-libs/wayland-protocols
245 - )
246 - X? (
247 - x11-libs/libX11
248 - x11-libs/libxcb
249 - x11-libs/xcb-util
250 - x11-libs/xcb-util-keysyms
251 - )
252 - x264? ( >=media-libs/x264-0.0.20190214:= )
253 - x265? ( media-libs/x265:= )
254 - xml? ( dev-libs/libxml2:2 )
255 - zeroconf? ( net-dns/avahi[dbus] )
256 - zvbi? ( media-libs/zvbi )
257 -"
258 -DEPEND="${RDEPEND}
259 - X? ( x11-base/xorg-proto )
260 -"
261 -
262 -PATCHES=(
263 - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
264 - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
265 - "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
266 -)
267 -
268 -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
269 -
270 -S="${WORKDIR}/${MY_P}"
271 -
272 -src_prepare() {
273 - xdg_src_prepare # bug 608256
274 -
275 - has_version '>=net-libs/libupnp-1.8.0' && \
276 - eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
277 -
278 - # Bootstrap when we are on a git checkout.
279 - if [[ ${PV} = *9999 ]] ; then
280 - ./bootstrap
281 - fi
282 -
283 - # Make it build with libtool 1.5
284 - rm m4/lt* m4/libtool.m4 || die
285 -
286 - # We are not in a real git checkout due to the absence of a .git directory.
287 - touch src/revision.txt || die
288 -
289 - # Don't use --started-from-file when not using dbus.
290 - if ! use dbus ; then
291 - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
292 - fi
293 -
294 - # Disable running of vlc-cache-gen, we do that in pkg_postinst
295 - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
296 - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
297 -
298 - eautoreconf
299 -
300 - # Disable automatic running of tests.
301 - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
302 -}
303 -
304 -src_configure() {
305 - local myeconfargs=(
306 - --disable-aa
307 - --disable-dependency-tracking
308 - --disable-optimizations
309 - --disable-rpath
310 - --disable-update-check
311 - --enable-fast-install
312 - --enable-screen
313 - --enable-vcd
314 - --enable-vlc
315 - $(use_enable a52)
316 - $(use_enable alsa)
317 - $(use_enable altivec)
318 - $(use_enable aom)
319 - $(use_enable archive)
320 - $(use_enable aribsub)
321 - $(use_enable bidi fribidi)
322 - $(use_enable bidi harfbuzz)
323 - $(use_enable bluray)
324 - $(use_enable cddb libcddb)
325 - $(use_enable chromaprint)
326 - $(use_enable chromecast)
327 - $(use_enable chromecast microdns)
328 - $(use_enable cpu_flags_x86_mmx mmx)
329 - $(use_enable cpu_flags_x86_sse sse)
330 - $(use_enable dav1d)
331 - $(use_enable dbus)
332 - $(use_enable dbus kwallet)
333 - $(use_enable dc1394)
334 - $(use_enable debug)
335 - $(use_enable directx)
336 - $(use_enable directx d3d11va)
337 - $(use_enable directx dxva2)
338 - $(use_enable dts dca)
339 - $(use_enable dvbpsi)
340 - $(use_enable dvd dvdnav)
341 - $(use_enable dvd dvdread)
342 - $(use_enable encode sout)
343 - $(use_enable encode vlm)
344 - $(use_enable faad)
345 - $(use_enable fdk fdkaac)
346 - $(use_enable ffmpeg avcodec)
347 - $(use_enable ffmpeg avformat)
348 - $(use_enable ffmpeg swscale)
349 - $(use_enable flac)
350 - $(use_enable fluidsynth)
351 - $(use_enable fontconfig)
352 - $(use_enable gcrypt libgcrypt)
353 - $(use_enable gme)
354 - $(use_enable gnome-keyring secret)
355 - $(use_enable gstreamer gst-decode)
356 - $(use_enable ieee1394 dv1394)
357 - $(use_enable jack)
358 - $(use_enable jpeg)
359 - $(use_enable kate)
360 - $(use_enable libass)
361 - $(use_enable libcaca caca)
362 - $(use_enable libnotify notify)
363 - $(use_enable libsamplerate samplerate)
364 - $(use_enable libtar)
365 - $(use_enable libtiger tiger)
366 - $(use_enable linsys)
367 - $(use_enable lirc)
368 - $(use_enable live live555)
369 - $(use_enable lua)
370 - $(use_enable macosx-notifications osx-notifications)
371 - $(use_enable mad)
372 - $(use_enable matroska)
373 - $(use_enable modplug mod)
374 - $(use_enable mp3 mpg123)
375 - $(use_enable mpeg libmpeg2)
376 - $(use_enable mtp)
377 - $(use_enable musepack mpc)
378 - $(use_enable ncurses)
379 - $(use_enable neon)
380 - $(use_enable ogg)
381 - $(use_enable omxil)
382 - $(use_enable omxil omxil-vout)
383 - $(use_enable opencv)
384 - $(use_enable optimisememory optimize-memory)
385 - $(use_enable opus)
386 - $(use_enable png)
387 - $(use_enable postproc)
388 - $(use_enable projectm)
389 - $(use_enable pulseaudio pulse)
390 - $(use_enable qt5 qt)
391 - $(use_enable rdp freerdp)
392 - $(use_enable run-as-root)
393 - $(use_enable samba smbclient)
394 - $(use_enable sdl-image)
395 - $(use_enable sftp)
396 - $(use_enable shout)
397 - $(use_enable sid)
398 - $(use_enable skins skins2)
399 - $(use_enable soxr)
400 - $(use_enable speex)
401 - $(use_enable srt)
402 - $(use_enable ssl gnutls)
403 - $(use_enable svg)
404 - $(use_enable svg svgdec)
405 - $(use_enable taglib)
406 - $(use_enable theora)
407 - $(use_enable tremor)
408 - $(use_enable twolame)
409 - $(use_enable udev)
410 - $(use_enable upnp)
411 - $(use_enable v4l v4l2)
412 - $(use_enable vaapi libva)
413 - $(use_enable vdpau)
414 - $(use_enable vnc)
415 - $(use_enable vorbis)
416 - $(use_enable vpx)
417 - $(use_enable wayland)
418 - $(use_with X x)
419 - $(use_enable X xcb)
420 - $(use_enable X xvideo)
421 - $(use_enable x264)
422 - $(use_enable x264 x26410b)
423 - $(use_enable x265)
424 - $(use_enable xml libxml2)
425 - $(use_enable zeroconf avahi)
426 - $(use_enable zvbi)
427 - $(use_enable !zvbi telx)
428 - --with-kde-solid=/usr/share/solid/actions
429 - --disable-asdcp
430 - --disable-coverage
431 - --disable-cprof
432 - --disable-crystalhd
433 - --disable-decklink
434 - --disable-gles2
435 - --disable-goom
436 - --disable-kai
437 - --disable-kva
438 - --disable-libplacebo
439 - --disable-macosx-qtkit
440 - --disable-maintainer-mode
441 - --disable-merge-ffmpeg
442 - --disable-mfx
443 - --disable-mmal
444 - --disable-opensles
445 - --disable-oss
446 - --disable-rpi-omxil
447 - --disable-schroedinger
448 - --disable-shine
449 - --disable-sndio
450 - --disable-spatialaudio
451 - --disable-vsxu
452 - --disable-wasapi
453 - --disable-wma-fixed
454 - )
455 - # ^ We don't have these disabled libraries in the Portage tree yet.
456 -
457 - # Compatibility fix for Samba 4.
458 - use samba && append-cppflags "-I/usr/include/samba-4.0"
459 -
460 - if use x86; then
461 - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
462 - append-cflags $(test-flags-CC -fno-stack-check)
463 - # Bug 569774
464 - replace-flags -Os -O2
465 - fi
466 -
467 - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
468 - append-cxxflags -std=c++11
469 -
470 - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
471 - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
472 -
473 - if use truetype || use bidi; then
474 - myeconfargs+=( --enable-freetype )
475 - else
476 - myeconfargs+=( --disable-freetype )
477 - fi
478 -
479 - if use truetype || use projectm; then
480 - local dejavu="/usr/share/fonts/dejavu/"
481 - myeconfargs+=(
482 - --with-default-font=${dejavu}/DejaVuSans.ttf
483 - --with-default-font-family=Sans
484 - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
485 - --with-default-monospace-font-family=Monospace
486 - )
487 - fi
488 -
489 - econf "${myeconfargs[@]}"
490 -
491 - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
492 - # Other values may break the build (bug 523144), so definition should not be removed.
493 - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
494 - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
495 -}
496 -
497 -src_test() {
498 - virtx emake check-TESTS
499 -}
500 -
501 -src_install() {
502 - default
503 - find "${D}" -name '*.la' -delete || die
504 -}
505 -
506 -pkg_postinst() {
507 - if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
508 - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
509 - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
510 - else
511 - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
512 - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
513 - ewarn "If you do not do it, vlc will take a long time to load."
514 - fi
515 -
516 - xdg_pkg_postinst
517 -}
518 -
519 -pkg_postrm() {
520 - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
521 - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
522 - fi
523 -
524 - xdg_pkg_postrm
525 -}