From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- media-video/vlc/Manifest | 8 +- media-video/vlc/metadata.xml | 2 + media-video/vlc/vlc-3.0.6.ebuild | 502 ++++++++++++++++++++++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 19 +- media-video/vlc/vlc-9999.ebuild | 19 +- 5 files changed, 535 insertions(+), 15 deletions(-) create mode 100644 media-video/vlc/vlc-3.0.6.ebuild (limited to 'media-video/vlc') diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index bd4eac2a0166..5d2294e8d872 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,7 +4,9 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 +DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 EBUILD vlc-3.0.4.ebuild 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d -EBUILD vlc-3.0.9999.ebuild 13264 BLAKE2B 3a45f9e018b98f09cf8b6c33cb8345f8dfb49abd31ffb0c39dde8a5adc7c3842177594d6ff4cb99f4c95e690daf1161ccb8c76459259f140da26db390489d8fd SHA512 0ef5e06d575cfe92aa336bb17bcbdac2c09a692310fa496db8768f3ce4ecc8f32ba20d0bad67da6c3e2278dfda9b828cb440b08c9b583f1cebc342cef8829aaf -EBUILD vlc-9999.ebuild 13247 BLAKE2B c7290d19ffe01ba299b8c3a9d320f414300fb60bb4536f05e6b4c6aa84fafdbbd787b20378b92386e3d40dab32f0ffbe406aa787d34abdb09f5f383abba67406 SHA512 56e2413f3d4bb15c01e8def45977630bb4280503c99bc47fc4304111d50ec2b63a21c401f559139c8909be182c39df333d216b4b989bfdda55337ac425e3dd1a -MISC metadata.xml 4878 BLAKE2B 9bceb02311f2a36536e92ed03e0bb8b7cc34139246ac40fc8450e1e7a245af4353cf3e8b526e5742a1bd85f3c21f2297bbf767ac38f129745a34d7a5114e2ff0 SHA512 8bcc809e4ea0956819a4802f3b3292dac8f9fed49935c33d6b3f80120998bd16681f2ad0218557f9e7e2989421028fba327caa34a81b5ffc22a321a834182cb1 +EBUILD vlc-3.0.6.ebuild 13449 BLAKE2B 5cb15a244371750ad391322cdd20dc0bda48657c191341bf0a977763c4f72e89ef00566f125b33344880c1139b607bbf9ce66a2ece786ed2af0f6df0730a4d43 SHA512 4b4b4990f6473cd8d1f0337c833316b240c0e3c68ca954109bfdc33361039a8b3306d6767bc9d5ac33a72faa891b80b776e09f3ff5743633a8aabbc428926996 +EBUILD vlc-3.0.9999.ebuild 13442 BLAKE2B d3c9a30af6e4ed8bab1e7ce601c3c6660405196192a7feb18a8d3e254ebb41b1aab3a7d3e092d6d83ec6e006d8ece235c7ac19c9bb866c713d9329cbe99e2f4b SHA512 a407ea8b98ce3ac828c266c3c8712370609e018df9e46622a23fa90fa1032beb73bc51450f087a35dc269f9765a4111241f1678315d62d44647318b714b135de +EBUILD vlc-9999.ebuild 13425 BLAKE2B 50b812df40511e99bc3c571b267dada553451054f115425b03f2c1d28148d2fd3c3c855c1f6742103a6cd96c2a5767be0c1a78ff9c42004aabd4b10549bf87cd SHA512 ccae9000dc217220a654e88eedb0e78de8bc86aec8e602b97a0b7bf50a09a08cc94f8227a318fc287584fc7b9b2b5354c5a1ba6c3e204f8aebbaa7e5bc760175 +MISC metadata.xml 5061 BLAKE2B 88d5027fa2a50db6a100bcb7cb6755ba56e056fc9cbb7d031e8c65d506082914421aa7b88809f07b34969388216f6fa402d045b48cb2919e6d61696eef76a1c7 SHA512 0ad4e4ba9d609ee349adf68d959629a7979757652fb841ce12e23a712d2f08a555211c5a5ac1f2f9b12acca307de19fbc04b9bccef402018a371892ffd9b7967 diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 1e1da8166718..8a7aef8ab363 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -6,12 +6,14 @@ Gentoo Video project + Enable H264 10-bit encoding support with media-libs/x264 Enable experimental support for AV1 codec Enable support for libarchive stream extractor Enable support for decoding ARIB STD-B24 subtitles Enable libbluray for Blu-ray disc support Enable libchromaprint for Chromaprint based audio fingerprinter support Enable experimental support for Google Chromecast + Enable support for media-libs/dav1d AV1 decoder Enable IIDC cameras support Enable Win32 DirectX, D3D11va and DxVA2 support Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via media-libs/libdvbpsi diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild new file mode 100644 index 000000000000..77c3ccca2221 --- /dev/null +++ b/media-video/vlc/vlc-3.0.6.ebuild @@ -0,0 +1,502 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" + fi + SCM="git-r3" +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +fi +inherit autotools flag-o-matic gnome2-utils toolchain-funcs virtualx xdg-utils ${SCM} + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast + dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac + fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate + libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua + macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses + neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 + rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl + svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx + wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + postproc? ( ffmpeg ) + skins? ( qt5 truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +RDEPEND=" + net-dns/libidn:= + sys-libs/zlib:0[minizip] + virtual/libintl:0 + virtual/opengl + a52? ( media-libs/a52dec:0 ) + alsa? ( media-libs/alsa-lib:0 ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + aribsub? ( media-libs/aribb24 ) + bidi? ( + dev-libs/fribidi:0 + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz + virtual/ttf-fonts:0 + ) + bluray? ( media-libs/libbluray:0= ) + cddb? ( media-libs/libcddb:0 ) + chromaprint? ( media-libs/chromaprint:0= ) + chromecast? ( + >=dev-libs/protobuf-2.5.0:= + >=net-libs/libmicrodns-0.0.9:= + ) + dav1d? ( media-libs/dav1d ) + dbus? ( sys-apps/dbus:0 ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394:0 + ) + dts? ( media-libs/libdca:0 ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) + faad? ( media-libs/faad2:0 ) + fdk? ( =media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) + ) + flac? ( + media-libs/flac:0 + media-libs/libogg:0 + ) + fluidsynth? ( media-sound/fluidsynth:0 ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error:0 + ) + gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + sys-libs/libavc1394:0 + sys-libs/libraw1394:0 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( media-libs/libkate:0 ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:0= + ) + libcaca? ( media-libs/libcaca:0 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify:0 + ) + libsamplerate? ( media-libs/libsamplerate:0 ) + libtar? ( dev-libs/libtar:0 ) + libtiger? ( media-libs/libtiger:0 ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc:0 ) + live? ( media-plugins/live:0 ) + lua? ( >=dev-lang/lua-5.1:0 ) + mad? ( media-libs/libmad ) + matroska? ( + dev-libs/libebml:0= + media-libs/libmatroska:0= + ) + modplug? ( media-libs/libmodplug ) + mp3? ( media-sound/mpg123 ) + mpeg? ( media-libs/libmpeg2 ) + mtp? ( media-libs/libmtp:0= ) + musepack? ( media-sound/musepack-tools:0 ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg:0 ) + opencv? ( media-libs/opencv:0= ) + opus? ( >=media-libs/opus-1.0.3:0 ) + png? ( media-libs/libpng:0= ) + postproc? ( libav? ( media-libs/libpostproc:0= ) ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) + pulseaudio? ( media-sound/pulseaudio:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + sdl-image? ( media-libs/sdl-image:0 ) + sftp? ( net-libs/libssh2:0 ) + shout? ( media-libs/libshout:0 ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + soxr? ( media-libs/soxr ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + srt? ( net-libs/srt ) + ssl? ( net-libs/gnutls:0 ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo:0 + ) + taglib? ( >=media-libs/taglib-1.9:0 ) + theora? ( media-libs/libtheora:0 ) + tremor? ( media-libs/tremor:0 ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts:0 + !fontconfig? ( media-fonts/dejavu:0 ) + ) + twolame? ( media-sound/twolame:0 ) + udev? ( virtual/udev:0 ) + upnp? ( net-libs/libupnp:= ) + v4l? ( media-libs/libv4l:0 ) + vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) + vdpau? ( x11-libs/libvdpau:0 ) + vnc? ( net-libs/libvncserver:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) + wayland? ( + >=dev-libs/wayland-1.15 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) + x265? ( media-libs/x265:0= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi:0[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.8:* + virtual/pkgconfig:* + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local myeconfargs=( + --disable-aa + --disable-dependency-tracking + --disable-optimizations + --disable-rpath + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vcd + --enable-vlc + $(use_enable a52) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable aribsub) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable chromecast microdns) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable mad) + $(use_enable matroska) + $(use_enable modplug mod) + $(use_enable mp3 mpg123) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable srt) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --with-kde-solid=/usr/share/solid/actions + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-schroedinger + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + if use x264; then + myeconfargs+=( $(use_enable 10bit x26410b) ) + else + myeconfargs+=( --disable-x26410b ) + fi + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 + append-cxxflags -std=c++11 + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" + + xdg_environment_reset # bug 608256 + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf ${myeconfargs[@]} + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" + "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 793f7690453d..a42a129f841e 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus - dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth - fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass - libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua +IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast + dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac + fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate + libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl @@ -75,6 +75,7 @@ RDEPEND=" >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) + dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 @@ -211,7 +212,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( media-libs/x264:0= ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) @@ -418,6 +419,12 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. + if use x264; then + myeconfargs+=( $(use_enable 10bit x26410b) ) + else + myeconfargs+=( --disable-x26410b ) + fi + # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 0f094ec3e453..a2dda47b1dd8 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus - dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth - fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass - libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua +IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast + dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac + fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms + libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl @@ -75,6 +75,7 @@ RDEPEND=" >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) + dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 @@ -214,7 +215,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( media-libs/x264:0= ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) @@ -419,6 +420,12 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. + if use x264; then + myeconfargs+=( $(use_enable 10bit x26410b) ) + else + myeconfargs+=( --disable-x26410b ) + fi + # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" -- cgit v1.2.3