From c85a90f90521c7e11d618b527d6630cc64cecbd4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Dec 2017 20:10:49 +0000 Subject: gentoo resync : 26.12.2017 --- media-video/Manifest.gz | Bin 29754 -> 29746 bytes media-video/dirac/Manifest | 1 - media-video/dirac/dirac-1.0.2.ebuild | 52 --- media-video/mediainfo/Manifest | 2 + media-video/mediainfo/mediainfo-17.12.ebuild | 71 ++++ media-video/rovclock/Manifest | 2 +- media-video/rovclock/rovclock-0.6e-r1.ebuild | 2 +- media-video/smplayer/Manifest | 2 + media-video/smplayer/smplayer-17.12.0.ebuild | 130 ++++++ media-video/vlc/Manifest | 11 +- media-video/vlc/files/vlc-2.2.8-freerdp-2.patch | 131 ++++++ .../vlc/files/vlc-9999-libupnp-slot-1.8.patch | 24 ++ media-video/vlc/vlc-2.2.8-r1.ebuild | 473 +++++++++++++++++++++ media-video/vlc/vlc-2.2.8.ebuild | 13 +- media-video/vlc/vlc-2.2.9999.ebuild | 13 +- media-video/vlc/vlc-3.0.9999.ebuild | 18 +- media-video/vlc/vlc-9999.ebuild | 20 +- 17 files changed, 881 insertions(+), 84 deletions(-) delete mode 100644 media-video/dirac/dirac-1.0.2.ebuild create mode 100644 media-video/mediainfo/mediainfo-17.12.ebuild create mode 100644 media-video/smplayer/smplayer-17.12.0.ebuild create mode 100644 media-video/vlc/files/vlc-2.2.8-freerdp-2.patch create mode 100644 media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch create mode 100644 media-video/vlc/vlc-2.2.8-r1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index a08b313f720d..48cf2defb349 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest index 29e91b93a5b3..b55220d69cf5 100644 --- a/media-video/dirac/Manifest +++ b/media-video/dirac/Manifest @@ -1,5 +1,4 @@ AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c EBUILD dirac-1.0.2-r1.ebuild 1502 BLAKE2B da6e0490d3235951e48484537f5411b85f4e7a495ae11479f0977df28258cc1247c85c6e6a963eb586d6a4b33c1b0ead5edf0a2f85cb63c30817ca4fd3407672 SHA512 30f862129ecc2bd6b683c70801d5974b74b598af16032c6b12b1fb45fc793779e37866d6ce06e1a45e644282e55caf5724f06f0ddd7aa67f4490f45b7d628f38 -EBUILD dirac-1.0.2.ebuild 1256 BLAKE2B a6a956a61952fa87febd609f22155995ac57c0265c909eeae79405fe86a274c65f5b274264ffa340e1555ac4d8784775bcc27e75f03532c823673be7bab7cc9f SHA512 acc928cbce4d609ea5a758132208a95b445993fb91a74e1c35c61c99a84298b0fe2abeedacb9b6632faf49eaabaf24b488f52f4c52daa6489ba3fb48b6e456ae MISC metadata.xml 298 BLAKE2B f1f8662f90d8bb126d611299d7b184d5b0d4fe7ca39415c7a1e9aa0f87f911469f7d423fd4f77c29e6734512131971a062b4eaf41ef2fed46f9e10b82aea3e84 SHA512 af4dca87e12f4378990ff854d7f6ad5af7ccc083694a3ad34521dece8cc740508aa2cecaf6ab8aae3cac66069ba9d6becc5fd7e0856af532a5011db50041dff6 diff --git a/media-video/dirac/dirac-1.0.2.ebuild b/media-video/dirac/dirac-1.0.2.ebuild deleted file mode 100644 index afc629a5c63e..000000000000 --- a/media-video/dirac/dirac-1.0.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="Open Source video codec" -HOMEPAGE="http://dirac.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="debug doc cpu_flags_x86_mmx static-libs" - -RDEPEND="" -DEPEND=" - doc? ( - app-doc/doxygen - virtual/latex-base - media-gfx/graphviz - app-text/dvipdfm - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.2-doc.patch - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - export VARTEXFONTS="${T}/fonts" - - econf \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable debug) \ - $(use_enable doc) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - latexdir="${EPREFIX}/usr/share/doc/${PF}/programmers" \ - algodir="${EPREFIX}/usr/share/doc/${PF}/algorithm" \ - faqdir="${EPREFIX}/usr/share/doc/${PF}" \ - install - - dodoc AUTHORS ChangeLog NEWS README TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + -} diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest index 3a81643ed706..94917c1d1786 100644 --- a/media-video/mediainfo/Manifest +++ b/media-video/mediainfo/Manifest @@ -1,5 +1,7 @@ DIST mediainfo_0.7.99.tar.xz 1327592 BLAKE2B 42b377ad263fa1a73e9158740be014f0c5ce4f7a00b023b8d6950c3fc0545f7f68c68fc546b4aaeff819152ab9d72d1232dd87d75089557a617dbb24b0acd269 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa DIST mediainfo_17.10.tar.xz 1319988 BLAKE2B fb1f8199849dd6bc5834a1d975936504c3c08d34c247e059b2b1e0c8db9bbf642b77be9606dd8eb8f481b25cb82b44eddd6ec30ed9afbbd58e8570a734e9023b SHA512 8e24aa71054c8887dc9fc6f9ddb188dfcf61afa37549aed77f77cd13f31cf1ac2e56c2f4e5901cc4ab9d52403740d82b8081898515b4f81944566941906b63f2 +DIST mediainfo_17.12.tar.xz 1335676 BLAKE2B 66bf02f74a63b40446cb061fe6422c84d61cb10db53394a7b356e0c0b76a7c934548bf75a8e8e5556a3fab2bd2f65c2a8c3d57040bd404e5258f0cfa4f87bbd9 SHA512 3fd6c8538c7703e657c6c20fec3ba071e5575f6010f41188bdd46749ecad9bddfa2362a5f0df6c23aa98375bb9078f14704b0729d1c54174449871992b968ff9 EBUILD mediainfo-0.7.99.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6 EBUILD mediainfo-17.10.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162 +EBUILD mediainfo-17.12.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3 diff --git a/media-video/mediainfo/mediainfo-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild new file mode 100644 index 000000000000..f3350adbb933 --- /dev/null +++ b/media-video/mediainfo/mediainfo-17.12.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0" + +inherit eutils autotools wxwidgets + +DESCRIPTION="MediaInfo supplies technical and tag information about media files" +HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo" +SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl mms wxwidgets" + +RDEPEND="sys-libs/zlib + >=media-libs/libzen-0.4.37 + ~media-libs/lib${P}[curl=,mms=] + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/MediaInfo + +pkg_setup() { + TARGETS="CLI" + use wxwidgets && TARGETS+=" GUI" +} + +src_prepare() { + eapply_user + + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} + sed -i -e "s:-O2::" configure.ac + eautoreconf + done +} + +src_configure() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} + local args="" + [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui" + econf ${args} + done +} + +src_compile() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} + default + done +} +src_install() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} + default + dodoc "${S}"/History_${target}.txt + if [[ ${target} == "GUI" ]]; then + newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png + make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK" + fi + done +} diff --git a/media-video/rovclock/Manifest b/media-video/rovclock/Manifest index da51ff150b8b..3b461cc66712 100644 --- a/media-video/rovclock/Manifest +++ b/media-video/rovclock/Manifest @@ -1,5 +1,5 @@ AUX rovclock-0.6e-ldflags.patch 279 BLAKE2B 2d0f8bb6b69a401af7f1cb28b016787a2c58305a4d9daf522b45f066cf8c5166e42031cfa686eaeeec050cca4cf70d8374d933ef221b3808206d11efe92f319f SHA512 19fd4e6ca973ba1067bc68d4b6719259b88e49b3ea59270095827518ea2da688750d932c2af3319231b007a80ed3bd268bc5ff22bd942e5249b40bd4f8f9718a DIST rovclock-0.6e.tar.bz2 29648 BLAKE2B 149fa6d972282a067d8bb58bf9b9030f094a7f5133eba7139e702a6f44df955522c908fe21e45f8a514938d8b23056ddfd5131f9f63950bfd36aa9e4f249c866 SHA512 b6db578d305e6110287a0881a3a8b16bb76e662380698493c704e84705de7a6da608843c1056d6f84e7275f9f5159c0436a580beb72f795b571a5d4784123e7a -EBUILD rovclock-0.6e-r1.ebuild 532 BLAKE2B af5c4eb3477079bb3e337702b8926aa27dc2c2b6fe04f1e99db25f3037e259c46061f6281598aca1c0497f214a057ce464395f7f45abe8bb4a025de3ed9a4404 SHA512 21d8df7208a5e42e99910e43d5ac3870723572e80e55afbf810c5cd6668690a23790856e7732676d89ed2a39dd39ae36913ccb56c455e1f40bbc861fb42c7fe1 +EBUILD rovclock-0.6e-r1.ebuild 531 BLAKE2B df8105daf7d5826f322a6b7c9bf16a189db756505ee5cb164914d0f501a42a1a6777e07e47951763ef727ee861f2449875ed13c3299c2a6f98798c15079768d8 SHA512 fa9f4284bd3d5e6191ceb357655437834e74db925cdd48a77789bf54a642376405a30d96b8a2540b0499102a3f9aad417a6d9884a0985ee8035d6ead78ca6d3c EBUILD rovclock-0.6e.ebuild 572 BLAKE2B a81d12adba11e6802ffab81b9d3cdd2551b6a5b4658c942f370c5b938912e1034d6e669388f9fd1e9aed30fcab578a481f26a297d5950db038002ae5479f1cef SHA512 9d878956d4327a868990ba23775ef9c191664084dae9b44c4f53affe8e12e3e0d0659dc67d52cdbd6517af9d4a655b92c3f82524ad5098c69bddc390cbd3e2fb MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-video/rovclock/rovclock-0.6e-r1.ebuild b/media-video/rovclock/rovclock-0.6e-r1.ebuild index 99e6304df25b..31fa9f608828 100644 --- a/media-video/rovclock/rovclock-0.6e-r1.ebuild +++ b/media-video/rovclock/rovclock-0.6e-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.hasw.net/linux/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" src_prepare() { diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 56d4268a88d2..1f9fe97d150c 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -2,5 +2,7 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc968335 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81 +DIST smplayer-17.12.0.tar.bz2 5040463 BLAKE2B 6171cc0071e35c001678816464c55a9c16a5978ae4cae9a428c609e4940d0d0516e7d4928e961ca1e97469d77776c7e03f8c9a5c1c6ea3597c9724a2f6ea1ada SHA512 7b09ed08cf94f03eb4f992bc1a70ba938d081410044892e55236aec791732ec34bbdd31c6cbd05aa0eeb5cab6c0bf0a7b458373157ba49eed2c6a90e0ac257d1 EBUILD smplayer-17.11.2.ebuild 3018 BLAKE2B 7817664c0e229b77c508b7fe24775a26266a8d4e91f9d3b9daa0ef4399f45c9c66d999f5b82f09e5872f381f76dd8d3df7bf38af0c88e2650deec33f5a736678 SHA512 f91392e1a442f48103b5d35765e7821b253d16e528f53ab903ed4ac2fd7ea2c05695120bd14c8288b89ed2b396a3ce024c250ef04472617b9d87ab0ca92a209e +EBUILD smplayer-17.12.0.ebuild 3020 BLAKE2B 46919ea0eac2a4c50a48da344850ed881ae9e93720f9ca8c76d25fc911bd7afef3eda1eb6d2795124a3d5686d6f2facbd4069bc4b32a8580c8ca390e33e1cb9d SHA512 acd70c7c17ab8c1b749d9f2e51877347c59c31c6b0e7178e1586f1cce902ef4cc2749b4815576de3660317f8ed4790b56bc91edab9c3ce90bd83e04b673625ba MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/smplayer-17.12.0.ebuild b/media-video/smplayer/smplayer-17.12.0.ebuild new file mode 100644 index 000000000000..3a43e40959a4 --- /dev/null +++ b/media-video/smplayer/smplayer-17.12.0.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl +he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU +sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW" +PLOCALE_BACKUP="en_US" + +inherit l10n qmake-utils xdg-utils + +DESCRIPTION="Great Qt GUI front-end for mplayer/mpv" +HOMEPAGE="http://www.smplayer.eu/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+ BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" +IUSE="autoshutdown bidi debug mpris" + +COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5= + dev-qt/qtnetwork:5[ssl] + dev-qt/qtscript:5 + dev-qt/qtsingleapplication[X,qt5] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-libs/zlib + autoshutdown? ( dev-qt/qtdbus:5 ) + mpris? ( dev-qt/qtdbus:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 +" +RDEPEND="${COMMON_DEPEND} + || ( + media-video/mplayer[bidi?,libass,png,X] + ( + >=media-video/mpv-0.15.0[libass,X] + >=net-misc/youtube-dl-2014.11.26 + ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 + "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch" +) + +src_prepare() { + use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch ) + + default + + # Upstream Makefile sucks + sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \ + -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \ + -e '/\.\/get_svn_revision\.sh/,+2c\ + cd src && $(DEFS) $(MAKE)' \ + Makefile || die + + # Turn off online update checker, bug #479902 + sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \ + -e 's:DEFINES += CHECK_UPGRADED:#&:' \ + -i src/smplayer.pro || die + + # Turn off intrusive share widget + sed -e 's:DEFINES += SHARE_WIDGET:#&:' \ + -i src/smplayer.pro || die + + # Toggle autoshutdown option which pulls in dbus, bug #524392 + if ! use autoshutdown ; then + sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \ + -i src/smplayer.pro || die + fi + + # Turn debug message flooding off + if ! use debug ; then + sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \ + -i src/smplayer.pro || die + fi + + # MPRIS2 pulls in dbus, bug #553710 + if ! use mpris ; then + sed -e 's:DEFINES += MPRIS2:#&:' \ + -i src/smplayer.pro || die + fi + + # Commented out because it gives false positives + #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts +} + +src_configure() { + cd src || die + eqmake5 +} + +gen_translation() { + local mydir="$(qt5_get_bindir)" + + ebegin "Generating $1 translation" + "${mydir}"/lrelease ${PN}_${1}.ts + eend $? || die "failed to generate $1 translation" +} + +src_compile() { + default + + cd src/translations || die + l10n_for_each_locale_do gen_translation +} + +src_install() { + # remove unneeded copies of the GPL + rm -f Copying* docs/*/gpl.html || die + # don't install empty dirs + rmdir --ignore-fail-on-non-empty docs/* || die + + default +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 312672284b80..a4acedc9c97c 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -9,14 +9,17 @@ AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671 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 AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3 +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-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 EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94 -EBUILD vlc-2.2.8.ebuild 14388 BLAKE2B b1533c2f64cfce232ae4534c24a0a256ac56e38826cc4d7a9b3f0feca18582643bb8c7dd351d6b2213b12e07d5725e36d00a25d681b1e080c79c141cb305129b SHA512 8ec3544f24d16cb899abfb7383a24185eb26b6e28f9428dabcfff20fc5d075ab4b0847bd9370e3c48a1d045b53cad45e1b1d79b039b148880612f0cfb651bb7d -EBUILD vlc-2.2.9999.ebuild 14397 BLAKE2B 12b32b791df7eb538e51a16804958a644e22be0e14227294fab4bbe997a20c916ff9a466277376bb62328902054326032180ec91b40cc85d58f71429ecb3795c SHA512 3f6a71ba9d661f6f4800de2f5c6d7f37a5d581f5a68e1032c9f08a6329fdf18ef4d0a1483e85fe61e54032e8a928dbc36f35d8d6f91d04f3e5ec1fd1d8aa4cc0 -EBUILD vlc-3.0.9999.ebuild 13353 BLAKE2B ab7145ef4c60e5ef6e23c159817ef5dad8d3f74b9f3e536f68ab53be9c433f732745e3b61b2554fd750d1fbc75075cadcbe5bfe0d04e06546a03b31caa0b59e6 SHA512 85748ee2f31a1e0349ff336f88a0073321f0201cbffc03255410516e9daef81b7ef9dfcc68a71d50598bade8bba5721ebfd4fa0a3fb599ff9a4640395f0bf64e -EBUILD vlc-9999.ebuild 13353 BLAKE2B ab7145ef4c60e5ef6e23c159817ef5dad8d3f74b9f3e536f68ab53be9c433f732745e3b61b2554fd750d1fbc75075cadcbe5bfe0d04e06546a03b31caa0b59e6 SHA512 85748ee2f31a1e0349ff336f88a0073321f0201cbffc03255410516e9daef81b7ef9dfcc68a71d50598bade8bba5721ebfd4fa0a3fb599ff9a4640395f0bf64e +EBUILD vlc-2.2.8-r1.ebuild 14501 BLAKE2B f5f57707d97f1fe8be98ddbe60bf5910b52c2d182f1e5c02dfb72692510a1a6993b622fa385e512f717db359e7261601e37931aa516741ceb27d7b9dbd021970 SHA512 8557031c00d21f0fc489f7bdb822278bea2dfae5639b627ecd77750831a3f8fd034897b19dab73db7820030f7e503c6c4d0e7b79ba7080ad78e88ddcae31a07f +EBUILD vlc-2.2.8.ebuild 14386 BLAKE2B de5df978e7c4aace18de3b8ce16978fdb6ecd1ff067edd5dae85ec59a590910ce552d3be6cbbe913a3b5001085d138c8d66c32bd1f2f0ac8b8ba65d8a630d743 SHA512 ec945449c875fa2ae2d9f720eecab33f5d135b229cb2f86663f7ff831b06f6818e0df3f1b50ed69f5e564a5012679440c670e0f55d5338f88a0afb7939921e63 +EBUILD vlc-2.2.9999.ebuild 14515 BLAKE2B 2b2d0e7b43ee273fca47b6870181adbc270843928d238abf68f29d76e79dea930fb2d8bf7ac21dd8c0b12e853cf09dd065876ac30ed3569ec64def0438bc7d0b SHA512 6d2d4ebd3c2f0a91ab093f3bb28f5a1e4f8e85657aab2db754dccabdd415c4c1fbfeca60fcf32f83381deda918a13d14edefcd07056ade5cc032ce975ec2079f +EBUILD vlc-3.0.9999.ebuild 13453 BLAKE2B 5569efb9bc45c932eb28af33a9c1378563ab9757083270d38ecf21954e95d3d38503e6a7cbbfc4d0dee75e368f11d2fdeebbbff68ca231303208b2593db9d084 SHA512 e213ad711037f64d70dd3939c4e651e506eaf25d83a2d6a92808e6cb801a8cf2007dc1788db99b2b45b6e1ba8efe56f1cd18b879b0ffcc8979073416985b431d +EBUILD vlc-9999.ebuild 13446 BLAKE2B c9040e62aee466381b63fb44ec9244b59b9412de70d4b24fc4f1897ee1b12e284811504eeb99dae8104455c534609e07485d9dd720eb0b379ed03d2989e7cdb5 SHA512 1325f825ad62d9197a1d3f2ad3842532c7f6aec1079826e524659b377f651b119bad5524570ce4c9ed3b49c602ac9fc727bd5da65ef77b447d87908cc73aed99 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f diff --git a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch new file mode 100644 index 000000000000..5cee1336505f --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch @@ -0,0 +1,131 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li + + dnl RDP/Remote Desktop access module + dnl +-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) ++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) ) + + dnl + dnl Real RTSP plugin +--- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100 ++++ b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100 +@@ -45,18 +45,6 @@ + # include + #endif + +-#if !defined(FREERDP_VERSION_MAJOR) || \ +- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) +-# define SoftwareGdi sw_gdi +-# define Fullscreen fullscreen +-# define ServerHostname hostname +-# define Username username +-# define Password password +-# define ServerPort port +-# define EncryptionMethods encryption +-# define ContextSize context_size +-#endif +- + #include + #ifdef HAVE_POLL + # include +@@ -140,6 +128,7 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; + demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; + rdpGdi *p_gdi = p_context->gdi; ++ unsigned bytesPerPixel; + + if ( p_sys->es ) + { +@@ -149,19 +138,23 @@ + + /* Now init and fill es format */ + vlc_fourcc_t i_chroma; +- switch( p_gdi->bytesPerPixel ) ++ switch( p_gdi->dstFormat ) + { + default: +- case 16: ++ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat); ++ case PIXEL_FORMAT_BGR16: + i_chroma = VLC_CODEC_RGB16; ++ bytesPerPixel = 16; + break; +- case 24: ++ case PIXEL_FORMAT_BGR24: + i_chroma = VLC_CODEC_RGB24; ++ bytesPerPixel = 24; + break; +- case 32: ++ case PIXEL_FORMAT_BGRA32: + i_chroma = VLC_CODEC_RGB32; ++ bytesPerPixel = 32; + break; + } + es_format_t fmt; + es_format_Init( &fmt, VIDEO_ES, i_chroma ); + +@@ -172,7 +165,7 @@ + fmt.video.i_height = p_gdi->height; + fmt.video.i_frame_rate_base = 1000; + fmt.video.i_frame_rate = 1000 * p_sys->f_fps; +- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel; ++ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel; + + if ( p_sys->p_block ) + p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize ); +@@ -233,28 +226,19 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; + + msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", +-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) + p_instance->settings->DesktopWidth, + p_instance->settings->DesktopHeight, + p_instance->settings->ColorDepth +-#else +- p_instance->settings->width, +- p_instance->settings->height, +- p_instance->settings->color_depth +-#endif + ); + + p_instance->update->DesktopResize = desktopResizeHandler; + p_instance->update->BeginPaint = beginPaintHandler; + p_instance->update->EndPaint = endPaintHandler; + +- gdi_init( p_instance, +- CLRBUF_16BPP | +-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ +- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) +- CLRBUF_24BPP | +-#endif +- CLRBUF_32BPP, NULL ); ++ if ( p_instance->settings->ColorDepth > 16 ) ++ gdi_init( p_instance, PIXEL_FORMAT_XRGB32); ++ else ++ gdi_init( p_instance, PIXEL_FORMAT_RGB16); + + desktopResizeHandler( p_instance->context ); + return true; +@@ -428,10 +412,6 @@ + if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; + p_sys->i_frame_interval = 1000000 / p_sys->f_fps; + +-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 +- freerdp_channels_global_init(); +-#endif +- + p_sys->p_instance = freerdp_new(); + if ( !p_sys->p_instance ) + { +@@ -506,9 +486,6 @@ + + freerdp_disconnect( p_sys->p_instance ); + freerdp_free( p_sys->p_instance ); +-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 +- freerdp_channels_global_uninit(); +-#endif + + if ( p_sys->p_block ) + block_Release( p_sys->p_block ); diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch new file mode 100644 index 000000000000..893f936b729e --- /dev/null +++ b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch @@ -0,0 +1,24 @@ +--- a/modules/services_discovery/upnp.hpp 2017-12-25 18:17:33.358015500 +0100 ++++ b/modules/services_discovery/upnp.hpp 2017-12-25 18:30:45.158167813 +0100 +@@ -35,8 +35,8 @@ + #include + #include + #endif +-#include +-#include ++#include ++#include + + #include + #include + +--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100 ++++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100 +@@ -4046,7 +4046,7 @@ + dnl + dnl UPnP Plugin (Intel SDK) + dnl +-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto]) ++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto]) + + EXTEND_HELP_STRING([Misc options:]) diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild new file mode 100644 index 000000000000..bdc58178d60a --- /dev/null +++ b/media-video/vlc/vlc-2.2.8-r1.ebuild @@ -0,0 +1,473 @@ +# Copyright 1999-2017 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="VLC media player - Video player and streamer" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-8" # vlc - vlccore + +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 + +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 +" +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 ) + qt5? ( X ) + sdl? ( X ) + skins? ( qt5 truetype X xml ) + vaapi? ( avcodec X ) + vdpau? ( X ) + vlm? ( encode ) + xv? ( xcb ) +" +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 ) + 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= ) + 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? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) + 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? ( >=media-libs/libsdl-1.2.10: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 ) + swscale? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:0= ) + ) + taglib? ( >=media-libs/taglib-1.9: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:= ) + 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 ) + 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 ) + zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) + zvbi? ( media-libs/zvbi:0 ) +" +DEPEND="${RDEPEND} + app-arch/xz-utils:0 + >=sys-devel/gettext-0.18.3:* + virtual/pkgconfig:* + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) + xcb? ( x11-proto/xproto:0 ) +" + +PATCHES=( + # Fix build system mistake. + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.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, #629294 + "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch + "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch + + # Bug #593460 + "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch + + "${FILESDIR}"/${P}-libupnp-compat.patch + + # Bug 590164 + "${FILESDIR}"/${P}-freerdp-2.patch +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-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 -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 + + # 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 + fi +} + +src_configure() { + local myconf + + # 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 + + # 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 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 + myconf+=" --disable-qt" + 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 + 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 + + 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 +} diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild index b7543790bf98..61ec7e46d584 100644 --- a/media-video/vlc/vlc-2.2.8.ebuild +++ b/media-video/vlc/vlc-2.2.8.ebuild @@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd 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 - +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout + +qt5 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 @@ -133,7 +133,6 @@ RDEPEND=" projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) 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:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 @@ -258,8 +257,12 @@ src_configure() { # 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. bug #499996 - use x86 && append-cflags $(test-flags-CC -fno-stack-check) + 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 # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" @@ -287,6 +290,7 @@ src_configure() { --disable-dependency-tracking \ --disable-optimizations \ --disable-update-check \ + --disable-freerdp \ --enable-fast-install \ --enable-screen \ $(use_enable a52) \ @@ -362,7 +366,6 @@ src_configure() { $(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) \ diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index f36f6cfefe2d..513a854d0f39 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -133,7 +133,7 @@ RDEPEND=" projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) - rdp? ( =net-misc/freerdp-1*:0=[client] ) + 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? ( >=media-libs/libsdl-1.2.10:0 @@ -213,6 +213,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch "${FILESDIR}"/${P}-libupnp-compat.patch + + # Bug 590164 + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) @@ -258,8 +261,12 @@ src_configure() { # 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. bug #499996 - use x86 && append-cflags $(test-flags-CC -fno-stack-check) + 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 # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index a425abcdf05f..7925c2465e78 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -165,7 +165,7 @@ RDEPEND=" dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) - rdp? ( =net-misc/freerdp-1*:0=[client] ) + 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-1.2.10:0 ) @@ -237,11 +237,9 @@ DEPEND="${RDEPEND} " PATCHES=( - # Fix build system mistake. - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - - # Bug #593460 - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch + "${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 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) @@ -281,8 +279,12 @@ src_configure() { # 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. bug #499996 - use x86 && append-cflags $(test-flags-CC -fno-stack-check) + 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 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index a425abcdf05f..e67e99283315 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -165,7 +165,7 @@ RDEPEND=" dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) - rdp? ( =net-misc/freerdp-1*:0=[client] ) + 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-1.2.10:0 ) @@ -237,11 +237,9 @@ DEPEND="${RDEPEND} " PATCHES=( - # Fix build system mistake. - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - - # Bug #593460 - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch + "${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 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) @@ -251,7 +249,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then @@ -281,8 +279,12 @@ src_configure() { # 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. bug #499996 - use x86 && append-cflags $(test-flags-CC -fno-stack-check) + 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 -- cgit v1.2.3