From b9ef7cab6264f1838672efbbcb4ba3b3abd5323f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2017 09:14:02 +0000 Subject: gentoo resync : 09.12.2017 --- media-video/vlc/vlc-9999.ebuild | 194 ++++++++++++++++++++++------------------ 1 file changed, 107 insertions(+), 87 deletions(-) (limited to 'media-video/vlc/vlc-9999.ebuild') diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index c406ba1759e9..a91223922ac3 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -21,7 +21,7 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" fi -inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM} +inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} DESCRIPTION="VLC media player - Video player and streamer" HOMEPAGE="https://www.videolan.org/vlc/" @@ -29,15 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-8" # vlc - vlccore -IUSE="a52 aalib alsa altivec +audioqueue +avcodec +avformat bidi bluray cddb - chromaprint chromecast dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd +IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb + chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt - gme gnutls gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca - libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-eyetv + gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 - mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus - png postproc projectm pulseaudio qt4 +qt5 rdp rtsp run-as-root samba - schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg + mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus + png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba + schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi " @@ -49,14 +49,10 @@ REQUIRED_USE=" ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) - httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - qt4? ( X ) - qt5? ( X ) - sdl? ( X ) - skins? ( truetype X xml || ( qt4 qt5 ) ) + skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) @@ -70,6 +66,8 @@ RDEPEND=" a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) @@ -84,28 +82,47 @@ RDEPEND=" chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) - dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) - directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) + dc1394? ( + >=media-libs/libdc1394-2.1:2 + >=sys-libs/libraw1394-2.0.1:0 + ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) - dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) - flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) + flac? ( + >=media-libs/flac-1.1.2:0 + >=media-libs/libogg-1:0 + ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) - gnutls? ( >=net-libs/gnutls-3.2.0:0 ) + gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) + ieee1394? ( + >=sys-libs/libavc1394-0.5.3:0 + >=sys-libs/libraw1394-2.0.1:0 + ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) - libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) + libass? ( + media-libs/fontconfig:1.0 + >=media-libs/libass-0.9.8:0= + ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) - libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libnotify:0 + ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) @@ -113,48 +130,75 @@ RDEPEND=" lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) - modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) + matroska? ( + >=dev-libs/libebml-1:0= + >=media-libs/libmatroska-1:0= + ) + modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) - opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) + opengl? ( + virtual/opengl:0 + >=x11-libs/libX11-1.3.99.901:0 + ) opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= sys-libs/zlib:0 ) + png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) - projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) - qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( dev-qt/qtx11extras:5 ) + ) rdp? ( =net-misc/freerdp-1*:0=[client] ) - samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] ) + samba? ( >=net-fs/samba-4.0.0:0[client] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl? ( >=media-libs/libsdl-1.2.10:0 - sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) + sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) - skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) - speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) - svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + svg? ( + >=gnome-base/librsvg-2.9:2 + >=x11-libs/cairo-1.13.1:0 + ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) - taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) - theora? ( >=media-libs/libtheora-1.0_beta3: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 ) ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts:0 + !fontconfig? ( media-fonts/dejavu:0 ) + ) twolame? ( media-sound/twolame:0 ) - udev? ( >=virtual/udev-142:0 ) + udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( @@ -174,14 +218,18 @@ RDEPEND=" X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) - xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) + xcb? ( + x11-libs/libxcb:0 + x11-libs/xcb-util:0 + x11-libs/xcb-util-keysyms:0 + ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) " DEPEND="${RDEPEND} app-arch/xz-utils:0 - >=sys-devel/gettext-0.19.6:* + >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) @@ -192,12 +240,6 @@ PATCHES=( # Fix build system mistake. "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - # Patch up incompatibilities and reconfigure autotools. - "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch - - # Fix up broken audio when skipping using a fixed reversed bisected commit. - "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch - # Bug #593460 "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch ) @@ -206,35 +248,16 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" -src_unpack() { - if [[ ${PV} = *9999 ]] ; then - git-r3_src_unpack - else - unpack ${A} - fi -} - src_prepare() { default - # Remove unnecessary warnings about unimplemented pragmas on gcc for now. - # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc. - # - # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas] - # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] - # - # https://gcc.gnu.org/c99status.html - if tc-is-gcc ; then - sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die - fi - # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then ./bootstrap fi # Make it build with libtool 1.5 - rm -f m4/lt* m4/libtool.m4 || die + 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 @@ -248,14 +271,6 @@ src_prepare() { # Disable automatic running of tests. find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die - - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt - # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. - if use qt5; then - export QT_SELECT=qt5 - elif use qt4; then - export QT_SELECT=qt4 - fi } src_configure() { @@ -281,10 +296,6 @@ src_configure() { --with-default-monospace-font-family=Monospace" fi - if use qt4 || use qt5 ; then - myconf+=" --enable-qt" - fi - econf \ ${myconf} \ --enable-vlc \ @@ -298,7 +309,8 @@ src_configure() { $(use_enable aalib aa) \ $(use_enable alsa) \ $(use_enable altivec) \ - $(use_enable audioqueue) \ + $(use_enable aom) \ + $(use_enable archive) \ $(use_enable avcodec) \ $(use_enable avformat) \ $(use_enable bidi fribidi) \ @@ -307,7 +319,6 @@ src_configure() { $(use_enable chromaprint) \ $(use_enable chromecast) \ $(use_enable dbus) \ - $(use_enable directfb) \ $(use_enable directx) \ $(use_enable dc1394) \ $(use_enable debug) \ @@ -325,7 +336,6 @@ src_configure() { $(use_enable gme) \ $(use_enable gnutls) \ $(use_enable gstreamer gst-decode) \ - $(use_enable httpd) \ $(use_enable ieee1394 dv1394) \ $(use_enable jack) \ $(use_enable jpeg) \ @@ -340,7 +350,6 @@ src_configure() { $(use_enable lirc) \ $(use_enable live live555) \ $(use_enable lua) \ - $(use_enable macosx-eyetv) \ $(use_enable macosx-notifications osx-notifications) \ $(use_enable macosx-qtkit) \ $(use_enable cpu_flags_x86_mmx mmx) \ @@ -361,12 +370,12 @@ src_configure() { $(use_enable postproc) \ $(use_enable projectm) \ $(use_enable pulseaudio pulse) \ + $(use_enable qt5 qt) \ $(use_enable rdp freerdp) \ $(use_enable rtsp realrtsp) \ $(use_enable run-as-root) \ $(use_enable samba smbclient) \ $(use_enable schroedinger) \ - $(use_enable sdl) \ $(use_enable sdl-image) \ $(use_enable sid) \ $(use_enable sftp) \ @@ -406,11 +415,11 @@ src_configure() { --disable-cprof \ --disable-crystalhd \ --disable-decklink \ - --disable-gles1 \ --disable-gles2 \ --disable-goom \ --disable-kai \ --disable-kva \ + --disable-libplacebo \ --disable-maintainer-mode \ --disable-merge-ffmpeg \ --disable-mfx \ @@ -420,7 +429,8 @@ src_configure() { --disable-rpi-omxil \ --disable-shine \ --disable-sndio \ - --disable-vda \ + --disable-spatialaudio \ + --disable-srt \ --disable-vsxu \ --disable-wasapi @@ -444,10 +454,20 @@ src_install() { 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" -f "/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() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update } -- cgit v1.2.3