summaryrefslogtreecommitdiff
path: root/media-video/vlc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-02 15:59:12 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-02 15:59:12 +0000
commit06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree8d58c1f4b049da677b33209b072f2b3057268fe0 /media-video/vlc
parent99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)
gentoo resync : 02.03.2018
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/Manifest15
-rw-r--r--media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch23
-rw-r--r--media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch47
-rw-r--r--media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch12
-rw-r--r--media-video/vlc/metadata.xml1
-rw-r--r--media-video/vlc/vlc-2.2.6.ebuild511
-rw-r--r--media-video/vlc/vlc-2.2.8-r1.ebuild2
-rw-r--r--media-video/vlc/vlc-3.0.0-r3.ebuild (renamed from media-video/vlc/vlc-3.0.0-r2.ebuild)20
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild38
-rw-r--r--media-video/vlc/vlc-9999.ebuild38
10 files changed, 80 insertions, 627 deletions
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b3e1790cc7a6..1d55962c3e75 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,10 +1,8 @@
AUX qt4-select.patch 2171 BLAKE2B 0034fcbc3987ed4829e0876c5ceb7e226d2050c60cc2dfd57b9ecb0be2d4791a7f87ccfa95572fcbf1758d19d12c017b7eb668eda77bb88763f18dfd4eec2e44 SHA512 0c3fab4457f1b8c9f1c2c9b690c1a137e1544a09a710e24ba9c8e228f0490ec27030846974610b8976bfca77e03054c5254719836cabc695a527f095659a651d
-AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 BLAKE2B 1fdbfee406ea3efd312e9cc047932418e2f4892f89404aeeb0f9c4e880bf622b1379bf0858ebcdb88dd8c461ed5608efabf40dfe62c45a23c6cf7ad4e4733511 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13
AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a7fa4dec9891f718816e44fd08970a5477cdc7ae34510b26af9971fe5d20b25c96595901117c804c7679341e1e8cd5309a14 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae
AUX vlc-2.2.2-qt5widgets.patch 603 BLAKE2B 912dc586e9341619dbeb20370b254bbf931ff80297f6cd703a31f3c635e70190237475e94fde6254927e6f17c7e3b0aa08ee1b803b6d099327a42be9567a2c64 SHA512 b5d8946406e84bce240376015ed994d6265d07fe9b777fd05c0f722142e99502bd129ec4acfe2cafa7a6dd98c9612913fa8644109489fa48dab6dc5522601050
AUX vlc-2.2.4-alsa-large-buffers.patch 1805 BLAKE2B f50698f38ec048e66df23e2fa700072c860da29ee638d0419130daf4614fd00e04fd9350719f2ccc87c413c02e7f91c5aa24eb5bfda29c8d434cb63df96c3cf8 SHA512 7376c79b935d56b51a3e039728764885b531435da92dad7d9f499bb47aff5363adb06405b86809cb5371ea45c34a28cf020a10d1edde4a16e59161c8bae2a7fd
AUX vlc-2.2.4-cxx0x.patch 598 BLAKE2B 80771a75c7f0dd8b5c2dda9d7957450a5d1b54a4a27e88a7c8a8d0c11a095fa13b1a899ddbbdab425236dfa6a2b925867c1dd370495f4e7d3eea2a2409889a4e SHA512 543357fdf86b56a236f2ff3f855e6ca3a3af2f5f6625539e923705671adcf29f8e3c967adf7f11bcec0e0d6646fcdb0c159bf70758bc2542b85f72eab8c280e4
-AUX vlc-2.2.4-decoder-lock-scope.patch 1337 BLAKE2B d1c178a3d7ded6cd3aa377d5064fd83f63ac7c69ad33f1a21399c6ef44c268355428caf29ab7e315455629320ad49252fd54683380cf54ad757d62bb3888c686 SHA512 a81704adf25aa54cc8fa7c2f97117ef6c300af15c5b78b74b0df5ee4eba1d8e0f9d9b3b99e2793f7362d1727de24990fb555222bd5f73cce31df2c49371063a1
AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671e114ae2a2d4997fae92f1aa9e2e87eb13583f7a51e005d452547b6a965b87c7a09472723a8005a9ada0b6d5bb SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee
AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
@@ -13,13 +11,10 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
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-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b
-AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
-DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
-EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
-EBUILD vlc-2.2.8-r1.ebuild 14829 BLAKE2B bd4dfb29beba20d2f9177c41ee4791aa733054eee6c522039b76586f0c9be8ec8ba6c79043a139ef0557b73cfc14c81edc7b14821241969a2bb8c84c1b5eefb0 SHA512 20305c4736dabc61729189a06be0082340f4f0619a9e49e28f4192585d88147c6a1c49a6284664c02b6674ab24c7ef4b1963484336cbb6c899330c048b250163
-EBUILD vlc-3.0.0-r2.ebuild 12863 BLAKE2B 0d2313a88955338588a2cfde86a58f5fa7a24ef7924bb385e2c6dffdf0e9221edea9c9947c191119423a072fa2398115593f7e803078014177d9419c761326bb SHA512 7bc01d12c7462d4a28a20ba73f22cb1e7d6fc1f3c29a751ec66b27d5e1c04f4e43804fea15c1aff8f550729a4a7ebd6675377b82b2d0c4d824d45aa9cd449230
-EBUILD vlc-3.0.9999.ebuild 12863 BLAKE2B 0d2313a88955338588a2cfde86a58f5fa7a24ef7924bb385e2c6dffdf0e9221edea9c9947c191119423a072fa2398115593f7e803078014177d9419c761326bb SHA512 7bc01d12c7462d4a28a20ba73f22cb1e7d6fc1f3c29a751ec66b27d5e1c04f4e43804fea15c1aff8f550729a4a7ebd6675377b82b2d0c4d824d45aa9cd449230
-EBUILD vlc-9999.ebuild 12830 BLAKE2B 6656ef058beef88a73e45edbca09d531c1dc7fdfbdfdf55ad2321fc7bda63fd7084ca4f501b62f035a8dbf06c9202f945ad46f0d441243b228721bb25020dd00 SHA512 bac7d6ea063b827269dd825f106da3659a444a40f18a7caee504f6e872bd0227b9861b142caa285c8dbf4ed4646ef3552b7fb22616a68af11f100ceededfbb2d
-MISC metadata.xml 6352 BLAKE2B 9476a4ab2bd3de2ab12818592ebb2e8864953b3f6fedbd9975ed7c1e239a54c16baa8fbc5a973c78eee4c772ba7b0208ffc355855300d209001e5d6c2469c0b3 SHA512 e28cb584b5e42f99bc372e9ccdfdd163bcacf60bcee77ea9e6ac92dc6758a378eaec72ee344d1a67b682288ba34b9b6998a7625a5d3ecbe3ba62889442695811
+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
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
deleted file mode 100644
index 3163410353a2..000000000000
--- a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index 2debbcd..72e7fcf 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
- {
-+ uint32_t rate = pa_stream_get_sample_spec(s)->rate;
- audio_output_t *aout = userdata;
-
-- msg_Dbg(aout, "underflow");
-- (void) s;
-+ msg_Warn(aout, "underflow");
-+ stream_stop(s, aout);
-+
-+ aout_sys_t *sys = aout->sys;
-+ sys->first_pts = VLC_TS_INVALID;
-+
-+ pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
-+ if (unlikely(op == NULL))
-+ return;
-+ pa_operation_unref(op);
- }
-
- static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
diff --git a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
deleted file mode 100644
index 51a2cdcb16da..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
-
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1162,7 +1162,10 @@
- b_paused = p_owner->b_paused;
-
- if (!p_audio)
-+ {
-+ vlc_mutex_unlock( &p_owner->lock );
- break;
-+ }
-
- /* */
- int i_rate = INPUT_RATE_DEFAULT;
-@@ -1180,6 +1183,9 @@
-
- if( unlikely(p_owner->b_paused != b_paused) )
- continue; /* race with input thread? retry... */
-+
-+ vlc_mutex_unlock( &p_owner->lock );
-+
- if( p_aout == NULL )
- b_reject = true;
-
-@@ -1199,7 +1205,6 @@
-
- break;
- }
-- vlc_mutex_unlock( &p_owner->lock );
- }
-
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
-@@ -1961,11 +1966,10 @@
-
- /* Parameters changed, restart the aout */
- vlc_mutex_lock( &p_owner->lock );
--
-- aout_DecDelete( p_owner->p_aout );
- p_owner->p_aout = NULL;
--
- vlc_mutex_unlock( &p_owner->lock );
-+ aout_DecDelete( p_owner->p_aout );
-+
- input_resource_PutAout( p_owner->p_resource, p_aout );
- }
-
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
deleted file mode 100644
index adfdefec56af..000000000000
--- a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -34,6 +34,9 @@
- #ifdef VLC_VA_BACKEND_XLIB
- # include <vlc_xlib.h>
- # include <va/va_x11.h>
-+#if VA_MINOR_VERSION >= 34
-+# include <va/va_compat.h>
-+#endif
- #endif
- #ifdef VLC_VA_BACKEND_DRM
- # include <sys/types.h>
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 318f173252f5..dbc125d2a0d5 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -41,6 +41,7 @@
<flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag>
<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag>
<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
+ <flag name="microdns">Enable Chromecast auto-detection using <pkg>net-libs/libmicrodns</pkg></flag>
<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
<flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag>
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild
deleted file mode 100644
index 8f50aca222db..000000000000
--- a/media-video/vlc/vlc-2.2.6.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ ${PV} = *9999 ]] ; then
- SCM="git-r3"
-
- if [ "${PV%.9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="git://git.videolan.org/vlc.git"
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-if [[ ${PV} = *9999 ]] ; then # Live ebuild
- SRC_URI=""
-elif [[ "${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
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="amd64 arm ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify
- +libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext 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 +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
-
-RDEPEND="
- dev-libs/libgpg-error:0
- net-dns/libidn:0
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
- aalib? ( media-libs/aalib:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avcodec? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- avformat? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- bidi? ( dev-libs/fribidi:0 )
- bluray? ( >=media-libs/libbluray-0.3:0= )
- cddb? ( >=media-libs/libcddb-1.2:0 )
- chromaprint? ( >=media-libs/chromaprint-0.6: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 )
- dts? ( >=media-libs/libdca-0.0.5:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-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 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
- gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
- gnutls? ( >=net-libs/gnutls-3.0.20: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 )
- 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 )
- 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 )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
- libtiger? ( >=media-libs/libtiger-0.3.1:0 )
- linsys? ( >=media-libs/zvbi-0.2.28:0 )
- 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 )
- 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] )
- ogg? ( >=media-libs/libogg-1:0 )
- opencv? ( >media-libs/opencv-2: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 )
- postproc? (
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( media-libs/libpostproc:0= )
- )
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu: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 )
- rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0_alpha1: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 ) )
- 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: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 )
- 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-142:0 )
- upnp? ( net-libs/libupnp:0 )
- v4l? ( media-libs/libv4l:0 )
- vaapi? (
- x11-libs/libva:0[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
- libav? ( media-video/libav:0=[vaapi] )
- )
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
- vdpau? (
- x11-libs/libvdpau:0
- !libav? ( media-video/ffmpeg:0= )
- libav? ( >=media-video/libav-10:0= )
- )
- vnc? ( >=net-libs/libvncserver-0.9.9:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
- 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 )
- xml? ( dev-libs/libxml2:2 )
- zvbi? ( media-libs/zvbi:0 )
-"
-
-DEPEND="${RDEPEND}
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- xcb? ( x11-proto/xproto:0 )
- app-arch/xz-utils:0
- >=sys-devel/gettext-0.18.3:*
- virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
- aalib? ( X )
- bidi? ( truetype )
- cddb? ( cdda )
- dvb? ( dvbpsi )
- dxva2? ( avcodec )
- 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 ) )
- vaapi? ( avcodec X )
- vdpau? ( X )
- vlm? ( encode )
- xv? ( xcb )
-"
-
-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 #541678
- "${FILESDIR}"/qt4-select.patch
-
- # Allow QT5.5 since Gentoo has a patched QTwidgets
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
- # Bug #575072
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
- # Bug #589396
- "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
- # Bug #594126
- "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
- "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
- # Bug #593460
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
- if ! version_is_at_least 4.5 $(gcc-version) ; then
- die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
- fi
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999 ]] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # 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
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- default
-
- # 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
-
- eautoreconf
-
- # 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() {
- local myconf
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- # We need to disable -fstack-check if use >=gcc 4.8.0.
- # See bug #499996
- use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
- # Needs libresid-builder from libsidplay:2 which is in another directory...
- # FIXME!
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- if use truetype || use projectm ; then
- local dejavu="/usr/share/fonts/dejavu/"
- myconf="--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
-
- if use qt5 ; then
- myconf+=" --enable-qt=5"
- else
- if use qt4 ; then
- myconf+=" --enable-qt=4"
- else
- myconf+=" --disable-qt"
- fi
- fi
-
- econf \
- ${myconf} \
- --enable-vlc \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- --disable-optimizations \
- --disable-update-check \
- --enable-fast-install \
- --enable-screen \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable atmo) \
- $(use_enable audioqueue) \
- $(use_enable avcodec) \
- $(use_enable avformat) \
- $(use_enable bidi fribidi) \
- $(use_enable bluray) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable chromaprint) \
- $(use_enable dbus) \
- $(use_enable directfb) \
- $(use_enable directx) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvbpsi) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable dxva2) \
- $(use_enable encode sout) \
- $(use_enable faad) \
- $(use_enable fdk fdkaac) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable growl) \
- $(use_enable gstreamer gst-decode) \
- $(use_enable httpd) \
- $(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-dialog-provider) \
- $(use_enable macosx-eyetv) \
- $(use_enable macosx-qtkit) \
- $(use_enable macosx-quartztext) \
- $(use_enable matroska mkv) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(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 ogg mux_ogg) \
- $(use_enable omxil) \
- $(use_enable omxil omxil-vout) \
- $(use_enable opencv) \
- $(use_enable opengl glspectrum) \
- $(use_enable opus) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable png) \
- $(use_enable postproc) \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- $(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) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable svg) \
- $(use_enable svg svgdec) \
- $(use_enable swscale) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable tremor) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- $(use_enable v4l v4l2) \
- $(use_enable vaapi libva) \
- $(use_enable vcdx) \
- $(use_enable vdpau) \
- $(use_enable vlm) \
- $(use_enable vnc) \
- $(use_enable vorbis) \
- $(use_enable vpx) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable x265) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xv xvideo) \
- $(use_enable zeroconf bonjour) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-asdcp \
- --disable-coverage \
- --disable-cprof \
- --disable-crystalhd \
- --disable-decklink \
- --disable-gles1 \
- --disable-gles2 \
- --disable-goom \
- --disable-kai \
- --disable-kva \
- --disable-maintainer-mode \
- --disable-merge-ffmpeg \
- --disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
- --disable-opensles \
- --disable-oss \
- --disable-quicktime \
- --disable-rpi-omxil \
- --disable-shine \
- --disable-sndio \
- --disable-vda \
- --disable-vsxu \
- --disable-wasapi
-
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
-
- # Punt useless libtool's .la files
- 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" -f "/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
-}
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index cf77af601678..39a113518713 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.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 gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
diff --git a/media-video/vlc/vlc-3.0.0-r2.ebuild b/media-video/vlc/vlc-3.0.0-r3.ebuild
index 953df06005ed..3793d2b5b099 100644
--- a/media-video/vlc/vlc-3.0.0-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.0-r3.ebuild
@@ -33,14 +33,15 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
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 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
+ 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
"
REQUIRED_USE="
bidi? ( truetype )
+ chromecast? ( encode )
directx? ( ffmpeg )
fontconfig? ( truetype )
libcaca? ( X )
@@ -125,6 +126,7 @@ RDEPEND="
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 )
@@ -225,6 +227,13 @@ 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
@@ -319,6 +328,7 @@ src_configure() {
$(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)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 953df06005ed..afb90b0cb92b 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -33,14 +33,14 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
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 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
+ 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
"
REQUIRED_USE="
- bidi? ( truetype )
+ chromecast? ( encode )
directx? ( ffmpeg )
fontconfig? ( truetype )
libcaca? ( X )
@@ -61,7 +61,12 @@ RDEPEND="
alsa? ( media-libs/alsa-lib:0 )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
- bidi? ( dev-libs/fribidi:0 )
+ 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= )
@@ -125,6 +130,7 @@ RDEPEND="
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 )
@@ -225,6 +231,13 @@ 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
@@ -272,6 +285,7 @@ src_configure() {
$(use_enable aom)
$(use_enable archive)
$(use_enable bidi fribidi)
+ $(use_enable bidi harfbuzz)
$(use_enable bluray)
$(use_enable cddb libcddb)
$(use_enable chromaprint)
@@ -319,6 +333,7 @@ src_configure() {
$(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)
@@ -354,7 +369,6 @@ src_configure() {
$(use_enable taglib)
$(use_enable theora)
$(use_enable tremor)
- $(use_enable truetype freetype)
$(use_enable twolame)
$(use_enable udev)
$(use_enable upnp)
@@ -420,7 +434,13 @@ src_configure() {
xdg_environment_reset # bug 608256
- if use truetype || use projectm ; then
+ 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
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 21bc19b30620..c86292213343 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -33,14 +33,14 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
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 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
+ 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
"
REQUIRED_USE="
- bidi? ( truetype )
+ chromecast? ( encode )
directx? ( ffmpeg )
fontconfig? ( truetype )
libcaca? ( X )
@@ -61,7 +61,12 @@ RDEPEND="
alsa? ( media-libs/alsa-lib:0 )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
- bidi? ( dev-libs/fribidi:0 )
+ 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= )
@@ -125,6 +130,7 @@ RDEPEND="
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 )
@@ -226,6 +232,13 @@ 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
@@ -272,6 +285,7 @@ src_configure() {
$(use_enable aom)
$(use_enable archive)
$(use_enable bidi fribidi)
+ $(use_enable bidi harfbuzz)
$(use_enable bluray)
$(use_enable cddb libcddb)
$(use_enable chromaprint)
@@ -319,6 +333,7 @@ src_configure() {
$(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)
@@ -353,7 +368,6 @@ src_configure() {
$(use_enable taglib)
$(use_enable theora)
$(use_enable tremor)
- $(use_enable truetype freetype)
$(use_enable twolame)
$(use_enable udev)
$(use_enable upnp)
@@ -419,7 +433,13 @@ src_configure() {
xdg_environment_reset # bug 608256
- if use truetype || use projectm ; then
+ 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