diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /media-video/vlc/vlc-3.0.9999.ebuild | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'media-video/vlc/vlc-3.0.9999.ebuild')
-rw-r--r-- | media-video/vlc/vlc-3.0.9999.ebuild | 188 |
1 files changed, 88 insertions, 100 deletions
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index ebea92479e02..7ef85d86eb35 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then else EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" fi - SCM="git-r3" + inherit git-r3 else if [[ ${MY_P} = ${P} ]] ; then SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" @@ -21,7 +21,7 @@ else 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} +inherit autotools flag-o-matic toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/" @@ -29,7 +29,7 @@ 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 +IUSE="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 @@ -52,107 +52,113 @@ REQUIRED_USE=" vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) " +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) +" RDEPEND=" net-dns/libidn:= - sys-libs/zlib:0[minizip] - virtual/libintl:0 + sys-libs/zlib[minizip] + virtual/libintl virtual/opengl - a52? ( media-libs/a52dec:0 ) - alsa? ( media-libs/alsa-lib:0 ) + a52? ( media-libs/a52dec ) + alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( - dev-libs/fribidi:0 + dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz - virtual/ttf-fonts:0 + virtual/ttf-fonts ) - bluray? ( media-libs/libbluray:0= ) - cddb? ( media-libs/libcddb:0 ) - chromaprint? ( media-libs/chromaprint:0= ) + bluray? ( media-libs/libbluray:= ) + cddb? ( media-libs/libcddb ) + chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) - dbus? ( sys-apps/dbus:0 ) + dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 - sys-libs/libraw1394:0 + sys-libs/libraw1394 ) - dts? ( media-libs/libdca:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) + dts? ( media-libs/libdca ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( - >=media-libs/libdvdnav-4.9:0 - >=media-libs/libdvdread-4.9:0 + >=media-libs/libdvdnav-4.9 + >=media-libs/libdvdread-4.9 ) - faad? ( media-libs/faad2:0 ) - fdk? ( media-libs/fdk-aac:0= ) + faad? ( media-libs/faad2 ) + fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=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 + media-libs/flac + media-libs/libogg ) - fluidsynth? ( media-sound/fluidsynth:0 ) + fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= - dev-libs/libgpg-error:0 + dev-libs/libgpg-error ) - gme? ( media-libs/game-music-emu:0 ) + gme? ( media-libs/game-music-emu ) 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 + sys-libs/libavc1394 + sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate:0 ) + kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 - media-libs/libass:0= + media-libs/libass:= ) - libcaca? ( media-libs/libcaca:0 ) + libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 - x11-libs/libnotify:0 + x11-libs/libnotify ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( dev-libs/libtar:0 ) - libtiger? ( media-libs/libtiger:0 ) + libsamplerate? ( media-libs/libsamplerate ) + libtar? ( dev-libs/libtar ) + libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc:0 ) - live? ( media-plugins/live:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live:= ) + lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( - dev-libs/libebml:0= - media-libs/libmatroska:0= + dev-libs/libebml:= + media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) - mtp? ( media-libs/libmtp:0= ) - musepack? ( media-sound/musepack-tools:0 ) + mtp? ( media-libs/libmtp:= ) + musepack? ( media-sound/musepack-tools ) 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 ) + ogg? ( media-libs/libogg ) + opencv? ( media-libs/opencv:= ) + opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) - postproc? ( libav? ( media-libs/libpostproc:0= ) ) + postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( - media-fonts/dejavu:0 - media-libs/libprojectm:0 + media-fonts/dejavu + media-libs/libprojectm ) - pulseaudio? ( media-sound/pulseaudio:0 ) + pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -163,45 +169,45 @@ RDEPEND=" x11-libs/libX11 ) ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[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 ) + sdl-image? ( media-libs/sdl-image ) + sftp? ( net-libs/libssh2 ) + shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( - x11-libs/libXext:0 - x11-libs/libXinerama:0 - x11-libs/libXpm:0 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( - >=media-libs/speex-1.2.0:0 - media-libs/speexdsp:0 + >=media-libs/speex-1.2.0 + media-libs/speexdsp ) srt? ( net-libs/srt ) - ssl? ( net-libs/gnutls:0 ) + ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 - x11-libs/cairo:0 + x11-libs/cairo ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( media-libs/libtheora:0 ) - tremor? ( media-libs/tremor:0 ) + taglib? ( >=media-libs/taglib-1.9 ) + theora? ( media-libs/libtheora ) + tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 - virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) + virtual/ttf-fonts + !fontconfig? ( media-fonts/dejavu ) ) - twolame? ( media-sound/twolame:0 ) - udev? ( virtual/udev:0 ) + twolame? ( media-sound/twolame ) + udev? ( virtual/udev ) 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= ) + v4l? ( media-libs/libv4l:= ) + vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + vnc? ( net-libs/libvncserver ) + vorbis? ( media-libs/libvorbis ) + vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols @@ -212,20 +218,13 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( - !10bit? ( >=media-libs/x264-0.0.20160712:0= ) - 10bit? ( >=media-libs/x264-9999:0= ) - ) - x265? ( media-libs/x265:0= ) + x264? ( >=media-libs/x264-0.0.20190214:= ) + x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi:0[dbus] ) + zeroconf? ( net-dns/avahi[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 ) " @@ -240,7 +239,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" src_prepare() { - default + xdg_src_prepare # bug 608256 has_version '>=net-libs/libupnp-1.8.0' && \ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch @@ -390,6 +389,7 @@ src_configure() { $(use_enable X xcb) $(use_enable X xvideo) $(use_enable x264) + $(use_enable x264 x26410b) $(use_enable x265) $(use_enable xml libxml2) $(use_enable zeroconf avahi) @@ -422,12 +422,6 @@ 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" @@ -444,8 +438,6 @@ src_configure() { # 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 @@ -462,7 +454,7 @@ src_configure() { ) fi - econf ${myeconfargs[@]} + 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. @@ -480,7 +472,7 @@ src_install() { } pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + if [[ -z ${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 @@ -489,9 +481,7 @@ pkg_postinst() { 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 + xdg_pkg_postinst } pkg_postrm() { @@ -499,7 +489,5 @@ pkg_postrm() { 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 + xdg_pkg_postrm } |