From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- media-video/vlc/Manifest | 9 +- media-video/vlc/files/vlc-3.0.6-libav.patch | 12 - media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch | 35 -- media-video/vlc/files/vlc-3.0.6-sftp.patch | 24 - media-video/vlc/metadata.xml | 2 - media-video/vlc/vlc-3.0.6-r1.ebuild | 502 --------------------- media-video/vlc/vlc-3.0.7.1.ebuild | 2 +- 7 files changed, 3 insertions(+), 583 deletions(-) delete mode 100644 media-video/vlc/files/vlc-3.0.6-libav.patch delete mode 100644 media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch delete mode 100644 media-video/vlc/files/vlc-3.0.6-sftp.patch delete mode 100644 media-video/vlc/vlc-3.0.6-r1.ebuild (limited to 'media-video/vlc') diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index aecf322d403a..fb18d18c8393 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -2,14 +2,9 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b -AUX vlc-3.0.6-libav.patch 547 BLAKE2B bff54855b61b7bc29fe50203a08c19b04d037e21f8ef337e6ea78eaad8a655e5e2f8fc38278536335e52adc8d8017ea4b2e9ab1fb716ff58c58e972dfac5b45e SHA512 2b5fb815e3d91971a3566830d24abcab27d7aed9b176212166e7806b99c4387727ae912707ad2d21346c90e84b1d489b0e458c7c3053f8dc40f5f4a55e563be9 -AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa521b51a85b8d9a8288c46d059d79f6656cd7958c3003662a9c90599812dc7320781589c554ce2bf44c93c665297f6955 SHA512 bb57ec249174af38b657e2d48728de32998b74a58df3bbcaa17bf5c48338256370066247b278341e92a3116d0f56310cdea6d521c11c3380d39827449056ade3 -AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a9450e51a99346dd824f75089775ae09c0dbc48dce7adaa889f3b03570d2d995b2aade6e73ffcd8e8765cf51 SHA512 3f510d9b007ce353211db878b671c43b17abffafd22a03c883e509808ce8b46bf64fa48e64d077c1e8f6ba2cd1f3e08a24e5db48fcda9cba02bdf266ca1a4378 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d -DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 DIST vlc-3.0.7.1.tar.xz 26052372 BLAKE2B 349e967ff00db2fd5ea1a62deb12009ff0d85c56a82774aa4fedf7bffecd21b0c8c745f41eb4b9b4d36aaddcce95e79146901f318d18eab99f08e347841a8008 SHA512 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd -EBUILD vlc-3.0.6-r1.ebuild 13308 BLAKE2B 69eb584b41942885678439a16b0b99ccba1e00f6c369233a23d190b739d9ce2906e5c7fe2d4a2bff38edd5f03bb047f016a40839c9ea788c60b5824068e64db9 SHA512 fa81f931ed9216997be00835584542224eec9c74086b2df48c6c00ad8d3b15b88e51769402997103ed303fc77e81a35ed087b46a59c2306a1f510260454c5075 -EBUILD vlc-3.0.7.1.ebuild 13048 BLAKE2B bb256aca2e4ba0f58817f25527462475b37ae6f10c3a79459bc262dbef45a30563f4c8bed949d4496ae9cf1d1d02c8ae914238c2a1b8220e8bce2fb6fb016cd7 SHA512 cd5a7ebb8cfe0c712051b01a8f1f52195bee65c96aa105567a4557bf573b23b27c6d38caefe6a9014dbe1b27874fdde6d8ff2050f0da7f0830c83742ab3db0ab +EBUILD vlc-3.0.7.1.ebuild 13046 BLAKE2B 6de613f51251180988b9c307d0a819e62962e951ca27241f75ae633938857023c0971c3742c018f9c300c3953bee22d1a73310445256ce1aa98a98214ff54fe6 SHA512 a3c171357af06df86a077f467b497fdfe3ab4d6da41fd4336ea314b8afb82fd9b6e0adf3f999ae6f213cc979b11acbbe7947e967caf5af434c49493728ec2fde EBUILD vlc-3.0.9999.ebuild 13051 BLAKE2B 2e824fb9cdff5b9622e4321a40173a87487aee437539d87a3811a676e3523dfc5e9f494ec9e7e2de6f8062e50d5298eb77ebe520b7c6bb19b18ce25be979a038 SHA512 cb0b69d3902b78ab6b767d4ad23a240d048f1839b89a41760dbde5df01cf9837f2e2e823e9e599e10b068728000d5b700b89e1689dacd15c8070f77bb03f7196 EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4 -MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274 +MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889 diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch b/media-video/vlc/files/vlc-3.0.6-libav.patch deleted file mode 100644 index 08e13f15fb6e..000000000000 --- a/media-video/vlc/files/vlc-3.0.6-libav.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/modules/codec/avcodec/fourcc.c 2019-02-27 22:57:55.878463261 +0100 -+++ a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.000000000 +0100 -@@ -182,7 +182,9 @@ - /* AV_CODEC_ID_V210X */ - { VLC_CODEC_TMV, AV_CODEC_ID_TMV }, - { VLC_CODEC_V210, AV_CODEC_ID_V210 }, -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 - { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV }, -+#endif - /* AV_CODEC_ID_DPX */ - { VLC_CODEC_MAD, AV_CODEC_ID_MAD }, - { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU }, diff --git a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch deleted file mode 100644 index 1b58a03cc8cd..000000000000 --- a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001 -From: Danny Milosavljevic -Date: Mon, 11 Feb 2019 16:07:12 +0100 -Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer - frame formats in the chroma_table - -Signed-off-by: Steve Lhomme ---- - modules/codec/vpx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c -index f03c7fae62..59b3acdef7 100644 ---- a/modules/codec/vpx.c -+++ b/modules/codec/vpx.c -@@ -117,6 +117,7 @@ static const struct - { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, - - { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, -+#if VPX_IMAGE_ABI_VERSION < 5 - { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, - { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, - { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, -@@ -129,7 +130,7 @@ static const struct - - { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, - { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, -- -+#endif - { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, - { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, - --- -2.11.0 - diff --git a/media-video/vlc/files/vlc-3.0.6-sftp.patch b/media-video/vlc/files/vlc-3.0.6-sftp.patch deleted file mode 100644 index 3092bf5a47c7..000000000000 --- a/media-video/vlc/files/vlc-3.0.6-sftp.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Wed, 20 Mar 2019 05:20:30 +0200 -Subject: [PATCH] sftp: fix version for ECDSA known hosts (fixes #22060) - -1.8.x is a stable branch, separate from the feature branch that contains -the ECDSA support. ---- - modules/access/sftp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/access/sftp.c b/modules/access/sftp.c -index e420b91ca93..dc7f6cc27f7 100644 ---- a/modules/access/sftp.c -+++ b/modules/access/sftp.c -@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this ) - case LIBSSH2_HOSTKEY_TYPE_DSS: - knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS; - break; --#if LIBSSH2_VERSION_NUM >= 0x010801 -+#if LIBSSH2_VERSION_NUM >= 0x010900 - case LIBSSH2_HOSTKEY_TYPE_ECDSA_256: - knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256; - break; diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index f9ee39a780e3..44071ce53b84 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -32,7 +32,6 @@ Enable live555 streaming media support (client support for rtsp) Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things Enable Mac OS X notifications module (formerly growl) - Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg) Add libmpeg2 support for mpeg-1 and mpeg-2 video streams Enable support for nfs protocol via net-fs/libnfs @@ -53,7 +52,6 @@ Enable twolame support (MPEG Audio Layer 2 encoder) Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK - Enable fixed point WMA decoder Enable support for e.g. fullscreen mode via X and the X C-language binding. It does not build a graphical interface Support X265 Encoder Enable support for zero-configuration networking via avahi diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild deleted file mode 100644 index 0ecf3c646c68..000000000000 --- a/media-video/vlc/vlc-3.0.6-r1.ebuild +++ /dev/null @@ -1,502 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 - inherit 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 toolchain-funcs virtualx xdg - -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 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 ) -" -BDEPEND=" - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) -" -RDEPEND=" - net-dns/libidn:= - sys-libs/zlib[minizip] - virtual/libintl - virtual/opengl - 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 - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz - virtual/ttf-fonts - ) - 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 ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394 - ) - dts? ( media-libs/libdca ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) - dvd? ( - >=media-libs/libdvdnav-4.9 - >=media-libs/libdvdread-4.9 - ) - 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 - media-libs/libogg - ) - fluidsynth? ( media-sound/fluidsynth:= ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:0= - dev-libs/libgpg-error - ) - 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 - sys-libs/libraw1394 - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:= - ) - libcaca? ( media-libs/libcaca ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify - ) - libsamplerate? ( media-libs/libsamplerate ) - libtar? ( dev-libs/libtar ) - libtiger? ( media-libs/libtiger ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc ) - live? ( media-plugins/live:= ) - lua? ( >=dev-lang/lua-5.1:0= ) - mad? ( media-libs/libmad ) - matroska? ( - dev-libs/libebml:= - media-libs/libmatroska:= - ) - modplug? ( media-libs/libmodplug ) - mp3? ( media-sound/mpg123 ) - mpeg? ( media-libs/libmpeg2 ) - 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 ) - opencv? ( media-libs/opencv:= ) - opus? ( >=media-libs/opus-1.0.3 ) - png? ( media-libs/libpng:0= ) - postproc? ( libav? ( media-libs/libpostproc ) ) - projectm? ( - media-fonts/dejavu - media-libs/libprojectm - ) - pulseaudio? ( media-sound/pulseaudio ) - 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:=[client] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - sdl-image? ( media-libs/sdl-image ) - sftp? ( net-libs/libssh2 ) - shout? ( media-libs/libshout ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXpm - ) - soxr? ( >=media-libs/soxr-0.1.2 ) - speex? ( - >=media-libs/speex-1.2.0 - media-libs/speexdsp - ) - srt? ( net-libs/srt ) - ssl? ( net-libs/gnutls:= ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - ) - taglib? ( >=media-libs/taglib-1.9 ) - theora? ( media-libs/libtheora ) - tremor? ( media-libs/tremor ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts - !fontconfig? ( media-fonts/dejavu ) - ) - twolame? ( media-sound/twolame ) - udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:= ) - 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 - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( >=media-libs/x264-0.0.20160712:0= ) - x265? ( media-libs/x265:= ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606 - "${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290 - "${FILESDIR}"/${P}-libav.patch - "${FILESDIR}"/${P}-sftp.patch -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - xdg_src_prepare # bug 608256 - - 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 dav1d) - $(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 && has_version ">=media-libs/x264-0.0.20190214"; then - myeconfargs+=( --enable-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/" - - 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 [[ -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 - 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 - - xdg_pkg_postinst -} - -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 - - xdg_pkg_postrm -} diff --git a/media-video/vlc/vlc-3.0.7.1.ebuild b/media-video/vlc/vlc-3.0.7.1.ebuild index f3499f475675..52a230d3d179 100644 --- a/media-video/vlc/vlc-3.0.7.1.ebuild +++ b/media-video/vlc/vlc-3.0.7.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd" fi inherit autotools flag-o-matic toolchain-funcs virtualx xdg -- cgit v1.2.3