From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- media-video/vlc/Manifest | 9 +- media-video/vlc/files/vlc-3.0.1-qt-5.11.patch | 10 + media-video/vlc/metadata.xml | 1 + media-video/vlc/vlc-3.0.1-r1.ebuild | 496 ++++++++++++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 9 +- media-video/vlc/vlc-9999.ebuild | 8 +- 6 files changed, 524 insertions(+), 9 deletions(-) create mode 100644 media-video/vlc/files/vlc-3.0.1-qt-5.11.patch create mode 100644 media-video/vlc/vlc-3.0.1-r1.ebuild (limited to 'media-video/vlc') diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 1d55962c3e75..c2cbc4a9fd76 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -10,11 +10,14 @@ AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e3 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f AUX vlc-2.2.8-libupnp-compat.patch 815 BLAKE2B 059a1f572e39d09dc206a6af36bc5e50b800f089929456560663a631baf6b30d21b1d0234999d9f90de12a520e377c4578472b00b81f80a5f8a6c6b52c26b3e5 SHA512 befe64c5595bebbfd033db6c586e4cdf2092c3e691acc034b9aa499e462a5542fa3de21afd0953c74858bdce99db4339dd41414b96aeac1ccb60d7edcb24a964 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 +AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681fa94b0c512018475477974502ce0df4aa4939865f43c2bf393654db902df5f070edd802296f1d3ef71b8caeb0 SHA512 66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5 AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7 +DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c EBUILD vlc-2.2.8-r1.ebuild 14827 BLAKE2B 76fcf7e10666be5d138e22c47bbb64fa952218672f29611814adbb084aa3c10b4b0f6a96b3562b711a2ef87b376c88d37d84bb4fc4c04aaa678549c92d9b200e SHA512 9f87b17f44521ef886eed1fdc564a316eb92ea74ce47ce34cb8ca3d2de333e0c11107789170873b61a73ddb8599890c676b62fa6c91c771e6ec5f4a31700ff1b EBUILD vlc-3.0.0-r3.ebuild 13139 BLAKE2B 9f52a7050dad48c1f08e30a915f3a0ab5ae6ee26eafe7adc512e1718f4c45b58a36a6dceb6cc5b76242619eaed782878f0835237c7f50ba6b0a30a955fe2f36a SHA512 96863def89c1155e57258ff855266294d0417dd1ba168e7abb166b5c3de22211ebb715bf56dd57148653644a926477f26e543d2c279c56bb4ba4a61d8878ab75 -EBUILD vlc-3.0.9999.ebuild 13316 BLAKE2B 832f06544c877d13a468af69e140bc733729483e9d028fd8a8493a74745be46410ea4d8785e34305ff7244d8231c0358e090165c5d10bd135e07f27dc964ae09 SHA512 68eb389e505646b1b7b18600028ee38cb64ce956ea455dccb88eea4913b1346fe98acb3f1daebd5403722bf0deb59c16ec94753af37d5f28cf380f13ef3425af -EBUILD vlc-9999.ebuild 13283 BLAKE2B 9361cef0d0463a851b1a006b11014d9d1ae95592ca7c15236d57a009924549e4aa18eb338a1fe171b6f01abc5d2cdfbda06d2236decd16da52510de611700075 SHA512 381a6869343b65793de983c8c0eff6e49f776fcfe59ff9182a2cc826e686c62fc0317bcf1904ad8f4c5d1d4eaa24ddb2893bef9a64bf457ef06850888be93e9a -MISC metadata.xml 6454 BLAKE2B 74cc875628a4a2adf15d4747956d0f692fe77539c16ae4f1b2f3a382c5c962f2898e5c8f85b7ea3e6f452892a69980832b0c4beadb8bae78cdb1d4f3dee54299 SHA512 61db3400a54ff928807156b6d1b05ec1a61f397699a601358daa03b32f669f74f2bdc18fc0b36d2d82e7fcee40dd4f19b3b9c7b495bf1b2b3e21c63b85dbef48 +EBUILD vlc-3.0.1-r1.ebuild 13419 BLAKE2B 36843a85dc904191613790fe6813b807fc3aaa88ab0460464ffbcb1ea859853cfb03130e0aa0fc0eae9bbb9485419b05cd5d8b3afc7cf35b3501d88dd9fb03e3 SHA512 a0632f8003d29295aa88673d24acb70cb0d7407210f5ab8b0675e9ae7e70963a2c68325f03dc42bad652f072a7d86492b2f4604eeebd9a12b76b1ec53469395f +EBUILD vlc-3.0.9999.ebuild 13426 BLAKE2B 40b1ded2c8c7658afbc6eba562faacf37e28673f40531e0b66971d664d5c039ae41592efdc1f943a1d25dfe7ac3c0c91d279c26a28d9310bd1471cbf4b99d755 SHA512 f0455f5f83dfa28c226f9117b13e54963cac6936e763d43afea1cf42f6f173581dd62a8e507379bee6a9bbafd6aa18580e3831df23f6b5d618cc26354b1a23b2 +EBUILD vlc-9999.ebuild 13336 BLAKE2B 4e6f9637bccdb2214938c9159c959cef5cdf606b5eb268e72a4f7ac01c8f139a1425e2899bb16430e74ffd1e6f0bdf98b30c81530131cca0f735383815c6fca6 SHA512 680d65c81bba964497e6a45433e67803ccacc8dd397a78a2e61b443174da459610cc3d057322aa05e242776331fdac880cf4ed2a459fdf5bcab73a0e6455d45d +MISC metadata.xml 6541 BLAKE2B 4119e3ff76fea78140bcac05a2a2d244bfdd86d808ec1f9cf9171c6ec487aaa0b4ab32a43e259b69ed5d4677fc7a91c0d0fe5e074df0ddcf7fb380c9ba6fe5a4 SHA512 64e7aa292342c9c585c05cefce9d7582e8f01f2f8231625e8e393cebd53dbafe50e8a1c6ef6f4f0a2ee35d80912c11705538ec8316e30b771e8d4780ae1ee780 diff --git a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch new file mode 100644 index 000000000000..c99d89882478 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch @@ -0,0 +1,10 @@ +--- a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 17:57:40.000000000 +0100 ++++ b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 21:08:51.212556781 +0100 +@@ -33,6 +33,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index dbc125d2a0d5..9f898e2ac85a 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -58,6 +58,7 @@ Enable libshout output Adds support for playing C64 SID files through media-libs/libsidplay:2 Enable support for the skins2 interface + Enable SoX Resampler support via media-libs/soxr Enable image scaling and conversion via libswscale (part of FFmpeg) Enable tremor, a fixed-point version of the Ogg Vorbis decoder Enable twolame support (MPEG Audio Layer 2 encoder) diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild new file mode 100644 index 000000000000..f0d7e7c11f20 --- /dev/null +++ b/media-video/vlc/vlc-3.0.1-r1.ebuild @@ -0,0 +1,496 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 versionator 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="a52 alsa altivec aom archive 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 macosx-notifications + macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg + omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp + run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg + taglib theora tremor truetype twolame udev upnp vaapi v4l vcd 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:0 + 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:= ) + 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:= ) + 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-libs/fdk-aac:0= ) + ffmpeg? ( + !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-11.8: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 ) + matroska? ( + dev-libs/libebml:0= + media-libs/libmatroska:0= + ) + microdns? ( >=net-libs/libmicrodns-0.0.9:= ) + modplug? ( media-libs/libmodplug:0 ) + mp3? ( media-libs/libmad:0 ) + mpeg? ( media-libs/libmpeg2:0 ) + 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(-)] ) + schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) + 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 + ) + 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?] ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) + vdpau? ( x11-libs/libvdpau:0 ) + vnc? ( net-libs/libvncserver:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + 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= ) + 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-proto/xproto ) +" + +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 + "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + # https://bugs.gentoo.org/647668 + if use chromecast && ! use microdns; then + einfo "USE=microdns is required for Chromecast autodetection support" + fi +} + +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-update-check + --enable-fast-install + --enable-screen + --enable-vlc + $(use_enable a52) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(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 microdns) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(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 rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(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 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 vcd) + $(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) + --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-shine + --disable-sndio + --disable-spatialaudio + --disable-srt + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # 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 afb90b0cb92b..8645501957ea 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -35,9 +35,9 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp - run-as-root samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib - theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland - wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse + run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg + taglib theora tremor truetype twolame udev upnp vaapi v4l vcd 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 ) @@ -170,6 +170,7 @@ RDEPEND=" x11-libs/libXinerama:0 x11-libs/libXpm:0 ) + soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 @@ -225,6 +226,7 @@ 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 + "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) @@ -362,6 +364,7 @@ src_configure() { $(use_enable shout) $(use_enable sid) $(use_enable skins skins2) + $(use_enable soxr) $(use_enable speex) $(use_enable ssl gnutls) $(use_enable svg) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index c86292213343..e4501326f8a5 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -35,9 +35,9 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp - run-as-root samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib - theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland - wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse + run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg + taglib theora tremor truetype twolame udev upnp vaapi v4l vcd 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 ) @@ -170,6 +170,7 @@ RDEPEND=" x11-libs/libXinerama:0 x11-libs/libXpm:0 ) + soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 @@ -361,6 +362,7 @@ src_configure() { $(use_enable shout) $(use_enable sid) $(use_enable skins skins2) + $(use_enable soxr) $(use_enable speex) $(use_enable ssl gnutls) $(use_enable svg) -- cgit v1.2.3