From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- media-video/Manifest.gz | Bin 28087 -> 28089 bytes media-video/bino/Manifest | 2 +- media-video/bino/bino-1.6.6.ebuild | 17 +- media-video/smplayer/Manifest | 2 - media-video/smplayer/smplayer-18.5.0.ebuild | 134 ------ media-video/vlc/Manifest | 12 +- media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 +++ .../vlc/files/vlc-3.0.3-fix-disable-vlm.patch | 42 -- media-video/vlc/vlc-3.0.1-r1.ebuild | 498 +++++++++++++++++++++ media-video/vlc/vlc-3.0.2-r1.ebuild | 497 -------------------- media-video/vlc/vlc-3.0.2.ebuild | 498 +++++++++++++++++++++ media-video/vlc/vlc-3.0.3-r1.ebuild | 498 --------------------- media-video/vlc/vlc-3.0.9999.ebuild | 5 +- media-video/vlc/vlc-9999.ebuild | 5 +- media-video/vobcopy/Manifest | 2 +- media-video/vobcopy/vobcopy-1.2.0.ebuild | 18 +- 16 files changed, 1092 insertions(+), 1203 deletions(-) delete mode 100644 media-video/smplayer/smplayer-18.5.0.ebuild create mode 100644 media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch delete mode 100644 media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch create mode 100644 media-video/vlc/vlc-3.0.1-r1.ebuild delete mode 100644 media-video/vlc/vlc-3.0.2-r1.ebuild create mode 100644 media-video/vlc/vlc-3.0.2.ebuild delete mode 100644 media-video/vlc/vlc-3.0.3-r1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 3c79c1ac8720..07835fb5d9f1 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest index 15e73ab0408c..ddf76bd75cc5 100644 --- a/media-video/bino/Manifest +++ b/media-video/bino/Manifest @@ -1,4 +1,4 @@ AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0 -EBUILD bino-1.6.6.ebuild 1507 BLAKE2B 55990360ab9bcd21f57d631a88c1ebc82cc98fcfd652d17457e55d29dfe06d92817815babe040b689e44035493f196dafdf32c0ed3ca3dffa8b741b7f9a29b1a SHA512 fca8b2961701fbcf1df421cf0f0e65a3cb78dac56d06aea66fdd1f2a961babf6808aee68839ca12f4370afce7cdd89bda101597c9495e099d332c85daf4980a4 +EBUILD bino-1.6.6.ebuild 1506 BLAKE2B e1f92d28cf775fac59764eb3bb94e7135b456c8c75185695b80a38508c4d3c74666de12139bb8d9e802adadc484f4e4c9831c7e2b6a87e5f5601415b90693eb7 SHA512 c9a1572eb268f31cacf5ae70b07e8883a8204e9acd16c7e4790d15358804ba31a9b6beaa474ea04fc69e340f261932efda7328511e87c6ae9260fa61ebe7d61a MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild index e7bb97ed4b2a..b1090b68ef19 100644 --- a/media-video/bino/bino-1.6.6.ebuild +++ b/media-video/bino/bino-1.6.6.ebuild @@ -32,15 +32,6 @@ DEPEND="${RDEPEND} " src_configure() { - use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \ - && append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \ - -L/usr/$(get_libdir)" && append-libs "Xext" - use lirc && append-cppflags "-I/usr/include/lirc" \ - && append-libs "lirc_client" - - # Fix a compilation error because of a multiple definitions in glew - append-ldflags "-zmuldefs" - econf \ $(use_with video_cards_nvidia xnvctrl) \ $(use_with lirc) \ @@ -49,6 +40,14 @@ src_configure() { --with-qt-version=5 \ --htmldir=/usr/share/doc/${PF}/html + use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \ + && append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \ + -L/usr/$(get_libdir)" && append-libs "Xext" + use lirc && append-cppflags "-I/usr/include/lirc" \ + && append-libs "lirc_client" + + # Fix a compilation error because of a multiple definitions in glew + append-ldflags "-zmuldefs" } src_install() { diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 082cb6b4cc17..64a180a55c62 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -5,8 +5,6 @@ AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54 DIST smplayer-18.3.0.tar.bz2 5037751 BLAKE2B 74f8b2183dc5cbae212f68ac1c07c3ad28a40ee2119cb1716b4c8d893545ab9139df943b2445103cbb776a8f97a8ac1af0730c9fbacb1e1ad178c411e29ac82b SHA512 cb0ff19c240bf8d92b12b096c9bf627b8365b690a0f9af126f6cda5436e4ed42510a511617fee6edee4cf1fbc79fb04bf05377585bbf93755b784d0471d2d6d4 DIST smplayer-18.4.0.tar.bz2 5051804 BLAKE2B 6aea3eb570e4073d5deeca432c4e453ef6dee8e01c00651434f49bed924d750b8b90fe0cbb4a226f5322c18349f2ea75aff573485d3602af280cbee94d93500d SHA512 17d533465e841adbd94af24410bf0cf03fefcc8f5902577a54d3296bbe60b82cf295879b1b5d5407ef191b1609060e95dfe300f857b5d25bd970941a1be3d111 -DIST smplayer-18.5.0.tar.bz2 5040367 BLAKE2B 18b1db622f11cb8c9a5f088071fae8b3d7deb43ff05b8d84c96a9e9717c03fd5e29fbec0f101ca2088c627838501bc83f5746b1290ad6110b5c35255c1293bd0 SHA512 0e5dfa0d4ef435156d93d3231deff9cea695adac1e6364db8af7f6c0bd6918062de8cd5fcacd8057d181644d2ad7b9dfd2c8241402e479ad6bf3c4db970bb1ba EBUILD smplayer-18.3.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4 EBUILD smplayer-18.4.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e -EBUILD smplayer-18.5.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/smplayer-18.5.0.ebuild b/media-video/smplayer/smplayer-18.5.0.ebuild deleted file mode 100644 index 8b62e36f20f2..000000000000 --- a/media-video/smplayer/smplayer-18.5.0.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 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 gnome2-utils l10n qmake-utils toolchain-funcs 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" - "${FILESDIR}/${PN}-18.2.0-jobserver.patch" - "${FILESDIR}/${PN}-18.3.0-disable-werror.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() { - emake CC="$(tc-getCC)" - - 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() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index aa399de88669..e1f800ad2674 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -10,15 +10,15 @@ AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e3 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f AUX vlc-2.2.8-libupnp-compat.patch 815 BLAKE2B 059a1f572e39d09dc206a6af36bc5e50b800f089929456560663a631baf6b30d21b1d0234999d9f90de12a520e377c4578472b00b81f80a5f8a6c6b52c26b3e5 SHA512 befe64c5595bebbfd033db6c586e4cdf2092c3e691acc034b9aa499e462a5542fa3de21afd0953c74858bdce99db4339dd41414b96aeac1ccb60d7edcb24a964 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 +AUX vlc-3.0.1-arm-neon-fix.patch 2110 BLAKE2B a75c8d558611c249e6e5e77c2f826320f1dbe0657ac3016c8528047af3b815ea5fcaaa5c3c5e5cd6ef2a5ad4d0ee6e55b315aa30b699f04e9a676a8736b2c324 SHA512 85ab0a39e989dc09402dbaa807ffb392ab9b66caa0689ac0352bb01897ee664eb238aa8b390a3b41c1259a650ea1b859dcacc3104679cc65b7f2d0f283539e54 AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681fa94b0c512018475477974502ce0df4aa4939865f43c2bf393654db902df5f070edd802296f1d3ef71b8caeb0 SHA512 66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5 -AUX vlc-3.0.3-fix-disable-vlm.patch 1366 BLAKE2B a0ebb75f8b171063dfc4490ed8abfcad515cac85a618bcd0e157fda71a6673023d45682a5c5507ffbc1412e15f1edb3cd0e3f1e5095d9d5ce5dfb0ae51488e36 SHA512 544c3f57112e7c37c1fc3a853e45b6ca3c186ee70734cd755365b233cbd481257ec0a7be8e8213c55ee6c6110a2ee8c0d4bce50eab67cdd57cb4e74a9edab862 AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a +DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f -DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d -EBUILD vlc-3.0.2-r1.ebuild 13436 BLAKE2B 7ac65a355a8d490ee6d4b2b10367f7e07010f5b3875d7fa02852186d1076ba565c5c9326b75b71635629a1f040f305dbed86817fe746f9bbb7c10cdc079b090a SHA512 fd565e3519b7b2b223aacff1ba77238463704eb96d59cf0fcd6ac5bc32786e616395c25a51375b7e708a30691e2d42de3823445d92915c3a77b30717ddc29c9d -EBUILD vlc-3.0.3-r1.ebuild 13493 BLAKE2B 5a43ba5bfaffa55524db4df8aad415de0dbe975c0cfb34028d52153ae7584040a8c708505601494d574a85627ae93e16fbc23001308d2032fbd8b714b21bc874 SHA512 154a89f124649b56ba80370288bc56e08192b5aa941702387a54a94e09d8d557bfefc7df44b570371dadf045323d2bd8fe44b4e2308ef7197ff8d9d6161069b7 -EBUILD vlc-3.0.9999.ebuild 13438 BLAKE2B 30a55e20865b0bfd5dc0820189289aea9879e6d64cb36a8874edefcb4ac9d1df3621200926599ce349a001f3b4bb4d8e530ac03a52076dfb439eb0e2dfd1cfcf SHA512 a949edbf940f6f7cb039be03baf6d72ededf25a9e73c791e98baab31511527306c4f55b5eb4a04fa3e74f13a640df4095019ee5e75135e125ffee83f6a9a3a6f -EBUILD vlc-9999.ebuild 13348 BLAKE2B 0522a7d9f5db627af6c1e9f8f537f166c3a0482cabb7a3576022d811987cff264007627b6f2bec5c22f20212366760bd56035858759fec564ee8eb73c9c2c81d SHA512 218b12d15abaebe83aa2edc9e8782a3bb04d806b76fbe1afc21870ac9d5704fcb42ed3e9c6e56d7667437d85877a432bbced2d3be1d09291bf8e4086a94f41f4 +EBUILD vlc-3.0.1-r1.ebuild 13499 BLAKE2B 73a4d22e21b0198ea06d3049a323c4acf728f026d46a407137caab96fff63e9f45720cda16ac8961ee48e497baf3f5b5fb7296e439ba8f5b605b7774fcf68b1d SHA512 f928a50049fdbcd6bb498ab2dfbd40470ff92279339034320b722dba0ead2aeb01580aa394380011cf32c68117caf4ddfcddbe30cf61e45f4d3cd421a8d133b7 +EBUILD vlc-3.0.2.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f +EBUILD vlc-3.0.9999.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f +EBUILD vlc-9999.ebuild 13395 BLAKE2B bdb64730d08aa744300a4af237863940b5e8178be375879447a8b358122e75980cca93e0bd193b98e8e4c16d8de70fbdcd2947ff729f5e888c2e0c21339e1d9a SHA512 c5435dd7038057d256cbaef11cc654d521881cca8f28a8a94fef12c3a6e89252fa90a687ca65653fe42c10f467d0811ab0e698297f2b000548b93f8886fcf1b6 MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch new file mode 100644 index 000000000000..6ea45d5abf0b --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch @@ -0,0 +1,65 @@ +From: Janne Grunau +Date: Mon, 19 Feb 2018 00:47:53 +0100 +Subject: arm: make the assembler functions compatible with non ELF/gas + platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Allow assembling arm neon functions for IOS and arm windows. + +Signed-off-by: Martin Storsjö +(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005) +Signed-off-by: Thomas Guillem + +[Add modules/arm_neon/asm.S missing from orig tarball.] +--- + modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + create mode 100644 modules/arm_neon/asm.S + +diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S +new file mode 100644 +index 0000000..728391e +--- /dev/null ++++ b/modules/arm_neon/asm.S +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (c) 2018 Janne Grunau ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifdef __APPLE__ ++# define EXTERN_ASM _ ++#else ++# define EXTERN_ASM ++#endif ++ ++#if defined(__APPLE__) || defined(_WIN32) ++# define HAVE_AS_ARCH_DIRECTIVE 0 ++# define HAVE_AS_FPU_DIRECTIVE 0 ++#else ++# define HAVE_AS_ARCH_DIRECTIVE 1 ++# define HAVE_AS_FPU_DIRECTIVE 1 ++#endif ++ ++.macro function name ++ .globl EXTERN_ASM\name ++#ifdef __ELF__ ++ .type EXTERN_ASM\name, %function ++#endif ++EXTERN_ASM\name: ++.endm diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch deleted file mode 100644 index fe4eecb8e767..000000000000 --- a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= -Date: Mon, 28 May 2018 18:25:15 +0200 -Subject: [PATCH] qt: Fix build with --disable-vlm -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fix #20495 - -(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8) -Signed-off-by: Hugo Beauzée-Luyssen ---- - modules/gui/qt/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am -index cb77b14d96..c67f4afc13 100644 ---- a/modules/gui/qt/Makefile.am -+++ b/modules/gui/qt/Makefile.am -@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \ - gui/qt/dialogs/open.moc.cpp \ - gui/qt/dialogs/openurl.moc.cpp \ - gui/qt/dialogs/podcast_configuration.moc.cpp \ -- gui/qt/dialogs/vlm.moc.cpp \ - gui/qt/dialogs/firstrun.moc.cpp \ - gui/qt/dialogs/extensions.moc.cpp \ - gui/qt/dialogs/fingerprintdialog.moc.cpp \ -@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES) - - nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp - -+if ENABLE_VLM -+nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp -+endif -+ - gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES) - $(AM_V_GEN)$(RCC) -name vlc -o $@ $< - --- -2.11.0 - diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild new file mode 100644 index 000000000000..1ac9c9a5b143 --- /dev/null +++ b/media-video/vlc/vlc-3.0.1-r1.ebuild @@ -0,0 +1,498 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" + fi + SCM="git-r3" +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +fi +inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 + debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig + +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications + macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg + omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp + run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg + taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx + wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + postproc? ( ffmpeg ) + skins? ( qt5 truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +RDEPEND=" + net-dns/libidn:0 + sys-libs/zlib:0[minizip] + virtual/libintl:0 + virtual/opengl + a52? ( media-libs/a52dec:0 ) + alsa? ( media-libs/alsa-lib:0 ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + bidi? ( + dev-libs/fribidi:0 + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz + virtual/ttf-fonts:0 + ) + bluray? ( media-libs/libbluray:0= ) + cddb? ( media-libs/libcddb:0 ) + chromaprint? ( media-libs/chromaprint:0= ) + chromecast? ( >=dev-libs/protobuf-2.5.0:= ) + dbus? ( sys-apps/dbus:0 ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394:0 + ) + dts? ( media-libs/libdca:0 ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) + faad? ( media-libs/faad2:0 ) + fdk? ( media-libs/fdk-aac:0= ) + ffmpeg? ( + !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) + ) + flac? ( + media-libs/flac:0 + media-libs/libogg:0 + ) + fluidsynth? ( media-sound/fluidsynth:0 ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error:0 + ) + gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + sys-libs/libavc1394:0 + sys-libs/libraw1394:0 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( media-libs/libkate:0 ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:0= + ) + libcaca? ( media-libs/libcaca:0 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify:0 + ) + libsamplerate? ( media-libs/libsamplerate:0 ) + libtar? ( dev-libs/libtar:0 ) + libtiger? ( media-libs/libtiger:0 ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc:0 ) + live? ( media-plugins/live:0 ) + lua? ( >=dev-lang/lua-5.1:0 ) + matroska? ( + dev-libs/libebml:0= + media-libs/libmatroska:0= + ) + microdns? ( >=net-libs/libmicrodns-0.0.9:= ) + modplug? ( media-libs/libmodplug:0 ) + mp3? ( media-libs/libmad:0 ) + mpeg? ( media-libs/libmpeg2:0 ) + mtp? ( media-libs/libmtp:0= ) + musepack? ( media-sound/musepack-tools:0 ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg:0 ) + opencv? ( media-libs/opencv:0= ) + opus? ( >=media-libs/opus-1.0.3:0 ) + png? ( media-libs/libpng:0= ) + postproc? ( libav? ( media-libs/libpostproc:0= ) ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) + pulseaudio? ( media-sound/pulseaudio:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) + sdl-image? ( media-libs/sdl-image:0 ) + sftp? ( net-libs/libssh2:0 ) + shout? ( media-libs/libshout:0 ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + soxr? ( media-libs/soxr ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + ssl? ( net-libs/gnutls:0 ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo:0 + ) + taglib? ( >=media-libs/taglib-1.9:0 ) + theora? ( media-libs/libtheora:0 ) + tremor? ( media-libs/tremor:0 ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts:0 + !fontconfig? ( media-fonts/dejavu:0 ) + ) + twolame? ( media-sound/twolame:0 ) + udev? ( virtual/udev:0 ) + upnp? ( net-libs/libupnp:= ) + v4l? ( media-libs/libv4l:0 ) + vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) + vdpau? ( x11-libs/libvdpau:0 ) + vnc? ( net-libs/libvncserver:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( media-libs/x264:0= ) + x265? ( media-libs/x265:0= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi:0[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.8:* + virtual/pkgconfig:* + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${P}-arm-neon-fix.patch # bug 649798 + "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + # https://bugs.gentoo.org/647668 + if use chromecast && ! use microdns; then + einfo "USE=microdns is required for Chromecast autodetection support" + fi +} + +src_prepare() { + default + + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local myeconfargs=( + --disable-aa + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vlc + $(use_enable a52) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable matroska) + $(use_enable microdns) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-srt + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 + append-cxxflags -std=c++11 + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" + + xdg_environment_reset # bug 608256 + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf ${myeconfargs[@]} + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" + "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-video/vlc/vlc-3.0.2-r1.ebuild b/media-video/vlc/vlc-3.0.2-r1.ebuild deleted file mode 100644 index 27977bca29e3..000000000000 --- a/media-video/vlc/vlc-3.0.2-r1.ebuild +++ /dev/null @@ -1,497 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" - else - EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" - fi - SCM="git-r3" -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" - fi - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd" -fi -inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} - -DESCRIPTION="Media player and framework with support for most multimedia files and streaming" -HOMEPAGE="https://www.videolan.org/vlc/" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore - -IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 - debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig - +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca - libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications - macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg - omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp - run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex 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 ) -" -RDEPEND=" - net-dns/libidn:= - sys-libs/zlib:0[minizip] - virtual/libintl:0 - virtual/opengl - a52? ( media-libs/a52dec:0 ) - alsa? ( media-libs/alsa-lib:0 ) - aom? ( media-libs/libaom:= ) - archive? ( app-arch/libarchive:= ) - bidi? ( - dev-libs/fribidi:0 - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz - virtual/ttf-fonts:0 - ) - bluray? ( media-libs/libbluray:0= ) - cddb? ( media-libs/libcddb:0 ) - chromaprint? ( media-libs/chromaprint:0= ) - chromecast? ( >=dev-libs/protobuf-2.5.0:= ) - dbus? ( sys-apps/dbus:0 ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394:0 - ) - dts? ( media-libs/libdca:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) - dvd? ( - >=media-libs/libdvdnav-4.9:0 - >=media-libs/libdvdread-4.9:0 - ) - faad? ( media-libs/faad2:0 ) - fdk? ( media-libs/fdk-aac:0= ) - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) - ) - flac? ( - media-libs/flac:0 - media-libs/libogg:0 - ) - fluidsynth? ( media-sound/fluidsynth:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:0= - dev-libs/libgpg-error:0 - ) - gme? ( media-libs/game-music-emu:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( - sys-libs/libavc1394:0 - sys-libs/libraw1394:0 - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate:0 ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:0= - ) - libcaca? ( media-libs/libcaca:0 ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify:0 - ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( dev-libs/libtar:0 ) - libtiger? ( media-libs/libtiger:0 ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc:0 ) - live? ( media-plugins/live:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( - dev-libs/libebml:0= - media-libs/libmatroska:0= - ) - microdns? ( >=net-libs/libmicrodns-0.0.9:= ) - modplug? ( media-libs/libmodplug:0 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( media-libs/libmpeg2:0 ) - mtp? ( media-libs/libmtp:0= ) - musepack? ( media-sound/musepack-tools:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - nfs? ( >=net-fs/libnfs-0.10.0:= ) - ogg? ( media-libs/libogg:0 ) - opencv? ( media-libs/opencv:0= ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= ) - postproc? ( libav? ( media-libs/libpostproc:0= ) ) - projectm? ( - media-fonts/dejavu:0 - media-libs/libprojectm:0 - ) - pulseaudio? ( media-sound/pulseaudio:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl-image? ( media-libs/sdl-image:0 ) - sftp? ( net-libs/libssh2:0 ) - shout? ( media-libs/libshout:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext:0 - x11-libs/libXinerama:0 - x11-libs/libXpm:0 - ) - soxr? ( media-libs/soxr ) - speex? ( - >=media-libs/speex-1.2.0:0 - media-libs/speexdsp:0 - ) - srt? ( net-libs/srt ) - ssl? ( net-libs/gnutls:0 ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo:0 - ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( media-libs/libtheora:0 ) - tremor? ( media-libs/tremor:0 ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) - ) - twolame? ( media-sound/twolame:0 ) - udev? ( virtual/udev:0 ) - upnp? ( net-libs/libupnp:= ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) - vdpau? ( x11-libs/libvdpau:0 ) - vnc? ( net-libs/libvncserver:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - wayland? ( - dev-libs/wayland - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi:0[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.19.8:* - virtual/pkgconfig:* - amd64? ( dev-lang/yasm:* ) - x86? ( dev-lang/yasm:* ) - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - # https://bugs.gentoo.org/647668 - if use chromecast && ! use microdns; then - einfo "USE=microdns is required for Chromecast autodetection support" - fi -} - -src_prepare() { - default - - has_version '>=net-libs/libupnp-1.8.0' && \ - eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch - - # Bootstrap when we are on a git checkout. - if [[ ${PV} = *9999 ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - # Disable running of vlc-cache-gen, we do that in pkg_postinst - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die -} - -src_configure() { - local myeconfargs=( - --disable-aa - --disable-dependency-tracking - --disable-optimizations - --disable-update-check - --enable-fast-install - --enable-screen - --enable-vcd - --enable-vlc - $(use_enable a52) - $(use_enable alsa) - $(use_enable altivec) - $(use_enable aom) - $(use_enable archive) - $(use_enable bidi fribidi) - $(use_enable bidi harfbuzz) - $(use_enable bluray) - $(use_enable cddb libcddb) - $(use_enable chromaprint) - $(use_enable chromecast) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable dbus) - $(use_enable dbus kwallet) - $(use_enable dc1394) - $(use_enable debug) - $(use_enable directx) - $(use_enable directx d3d11va) - $(use_enable directx dxva2) - $(use_enable dts dca) - $(use_enable dvbpsi) - $(use_enable dvd dvdnav) - $(use_enable dvd dvdread) - $(use_enable encode sout) - $(use_enable encode vlm) - $(use_enable faad) - $(use_enable fdk fdkaac) - $(use_enable ffmpeg avcodec) - $(use_enable ffmpeg avformat) - $(use_enable ffmpeg swscale) - $(use_enable flac) - $(use_enable fluidsynth) - $(use_enable fontconfig) - $(use_enable gcrypt libgcrypt) - $(use_enable gme) - $(use_enable gnome-keyring secret) - $(use_enable gstreamer gst-decode) - $(use_enable ieee1394 dv1394) - $(use_enable jack) - $(use_enable jpeg) - $(use_enable kate) - $(use_enable libass) - $(use_enable libcaca caca) - $(use_enable libnotify notify) - $(use_enable libsamplerate samplerate) - $(use_enable libtar) - $(use_enable libtiger tiger) - $(use_enable linsys) - $(use_enable lirc) - $(use_enable live live555) - $(use_enable lua) - $(use_enable macosx-notifications osx-notifications) - $(use_enable macosx-qtkit) - $(use_enable matroska) - $(use_enable microdns) - $(use_enable modplug mod) - $(use_enable mp3 mad) - $(use_enable mpeg libmpeg2) - $(use_enable mtp) - $(use_enable musepack mpc) - $(use_enable ncurses) - $(use_enable neon) - $(use_enable ogg) - $(use_enable omxil) - $(use_enable omxil omxil-vout) - $(use_enable opencv) - $(use_enable optimisememory optimize-memory) - $(use_enable opus) - $(use_enable png) - $(use_enable postproc) - $(use_enable projectm) - $(use_enable pulseaudio pulse) - $(use_enable qt5 qt) - $(use_enable rdp freerdp) - $(use_enable rtsp realrtsp) - $(use_enable run-as-root) - $(use_enable samba smbclient) - $(use_enable schroedinger) - $(use_enable sdl-image) - $(use_enable sftp) - $(use_enable shout) - $(use_enable sid) - $(use_enable skins skins2) - $(use_enable soxr) - $(use_enable speex) - $(use_enable 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) - --disable-asdcp - --disable-coverage - --disable-cprof - --disable-crystalhd - --disable-decklink - --disable-gles2 - --disable-goom - --disable-kai - --disable-kva - --disable-libplacebo - --disable-maintainer-mode - --disable-merge-ffmpeg - --disable-mfx - --disable-mmal - --disable-opensles - --disable-oss - --disable-rpi-omxil - --disable-shine - --disable-sndio - --disable-spatialaudio - --disable-vsxu - --disable-wasapi - ) - # ^ We don't have these disabled libraries in the Portage tree yet. - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - - xdg_environment_reset # bug 608256 - - if use truetype || use bidi; then - myeconfargs+=( --enable-freetype ) - else - myeconfargs+=( --disable-freetype ) - fi - - if use truetype || use projectm; then - local dejavu="/usr/share/fonts/dejavu/" - myeconfargs+=( - --with-default-font=${dejavu}/DejaVuSans.ttf - --with-default-font-family=Sans - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace - ) - fi - - econf ${myeconfargs[@]} - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values may break the build (bug 523144), so definition should not be removed. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild new file mode 100644 index 000000000000..9ee5edc366b8 --- /dev/null +++ b/media-video/vlc/vlc-3.0.2.ebuild @@ -0,0 +1,498 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" + fi + SCM="git-r3" +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +fi +inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 + debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig + +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications + macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg + omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp + run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg + taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx + wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + postproc? ( ffmpeg ) + skins? ( qt5 truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +RDEPEND=" + net-dns/libidn:= + sys-libs/zlib:0[minizip] + virtual/libintl:0 + virtual/opengl + a52? ( media-libs/a52dec:0 ) + alsa? ( media-libs/alsa-lib:0 ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + bidi? ( + dev-libs/fribidi:0 + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz + virtual/ttf-fonts:0 + ) + bluray? ( media-libs/libbluray:0= ) + cddb? ( media-libs/libcddb:0 ) + chromaprint? ( media-libs/chromaprint:0= ) + chromecast? ( >=dev-libs/protobuf-2.5.0:= ) + dbus? ( sys-apps/dbus:0 ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394:0 + ) + dts? ( media-libs/libdca:0 ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) + faad? ( media-libs/faad2:0 ) + fdk? ( media-libs/fdk-aac:0= ) + ffmpeg? ( + !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) + libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) + ) + flac? ( + media-libs/flac:0 + media-libs/libogg:0 + ) + fluidsynth? ( media-sound/fluidsynth:0 ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error:0 + ) + gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + sys-libs/libavc1394:0 + sys-libs/libraw1394:0 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( media-libs/libkate:0 ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:0= + ) + libcaca? ( media-libs/libcaca:0 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify:0 + ) + libsamplerate? ( media-libs/libsamplerate:0 ) + libtar? ( dev-libs/libtar:0 ) + libtiger? ( media-libs/libtiger:0 ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc:0 ) + live? ( media-plugins/live:0 ) + lua? ( >=dev-lang/lua-5.1:0 ) + matroska? ( + dev-libs/libebml:0= + media-libs/libmatroska:0= + ) + microdns? ( >=net-libs/libmicrodns-0.0.9:= ) + modplug? ( media-libs/libmodplug:0 ) + mp3? ( media-libs/libmad:0 ) + mpeg? ( media-libs/libmpeg2:0 ) + mtp? ( media-libs/libmtp:0= ) + musepack? ( media-sound/musepack-tools:0 ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg:0 ) + opencv? ( media-libs/opencv:0= ) + opus? ( >=media-libs/opus-1.0.3:0 ) + png? ( media-libs/libpng:0= ) + postproc? ( libav? ( media-libs/libpostproc:0= ) ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) + pulseaudio? ( media-sound/pulseaudio:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) + sdl-image? ( media-libs/sdl-image:0 ) + sftp? ( net-libs/libssh2:0 ) + shout? ( media-libs/libshout:0 ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + soxr? ( media-libs/soxr ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + srt? ( net-libs/srt ) + ssl? ( net-libs/gnutls:0 ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo:0 + ) + taglib? ( >=media-libs/taglib-1.9:0 ) + theora? ( media-libs/libtheora:0 ) + tremor? ( media-libs/tremor:0 ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts:0 + !fontconfig? ( media-fonts/dejavu:0 ) + ) + twolame? ( media-sound/twolame:0 ) + udev? ( virtual/udev:0 ) + upnp? ( net-libs/libupnp:= ) + v4l? ( media-libs/libv4l:0 ) + vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) + vdpau? ( x11-libs/libvdpau:0 ) + vnc? ( net-libs/libvncserver:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( media-libs/x264:0= ) + x265? ( media-libs/x265:0= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi:0[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.8:* + virtual/pkgconfig:* + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + # https://bugs.gentoo.org/647668 + if use chromecast && ! use microdns; then + einfo "USE=microdns is required for Chromecast autodetection support" + fi +} + +src_prepare() { + default + + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local myeconfargs=( + --disable-aa + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vlc + $(use_enable a52) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable matroska) + $(use_enable microdns) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable 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 vcd) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 + append-cxxflags -std=c++11 + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" + + xdg_environment_reset # bug 608256 + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf ${myeconfargs[@]} + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" + "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild deleted file mode 100644 index 848949599d65..000000000000 --- a/media-video/vlc/vlc-3.0.3-r1.ebuild +++ /dev/null @@ -1,498 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" - else - EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" - fi - SCM="git-r3" -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" - fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" -fi -inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} - -DESCRIPTION="Media player and framework with support for most multimedia files and streaming" -HOMEPAGE="https://www.videolan.org/vlc/" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore - -IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 - debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig - +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca - libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications - macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg - omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp - run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex 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 ) -" -RDEPEND=" - net-dns/libidn:= - sys-libs/zlib:0[minizip] - virtual/libintl:0 - virtual/opengl - a52? ( media-libs/a52dec:0 ) - alsa? ( media-libs/alsa-lib:0 ) - aom? ( media-libs/libaom:= ) - archive? ( app-arch/libarchive:= ) - bidi? ( - dev-libs/fribidi:0 - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz - virtual/ttf-fonts:0 - ) - bluray? ( media-libs/libbluray:0= ) - cddb? ( media-libs/libcddb:0 ) - chromaprint? ( media-libs/chromaprint:0= ) - chromecast? ( >=dev-libs/protobuf-2.5.0:= ) - dbus? ( sys-apps/dbus:0 ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394:0 - ) - dts? ( media-libs/libdca:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) - dvd? ( - >=media-libs/libdvdnav-4.9:0 - >=media-libs/libdvdread-4.9:0 - ) - faad? ( media-libs/faad2:0 ) - fdk? ( media-libs/fdk-aac:0= ) - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) - ) - flac? ( - media-libs/flac:0 - media-libs/libogg:0 - ) - fluidsynth? ( media-sound/fluidsynth:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:0= - dev-libs/libgpg-error:0 - ) - gme? ( media-libs/game-music-emu:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( - sys-libs/libavc1394:0 - sys-libs/libraw1394:0 - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate:0 ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:0= - ) - libcaca? ( media-libs/libcaca:0 ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify:0 - ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( dev-libs/libtar:0 ) - libtiger? ( media-libs/libtiger:0 ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc:0 ) - live? ( media-plugins/live:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( - dev-libs/libebml:0= - media-libs/libmatroska:0= - ) - microdns? ( >=net-libs/libmicrodns-0.0.9:= ) - modplug? ( media-libs/libmodplug:0 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( media-libs/libmpeg2:0 ) - mtp? ( media-libs/libmtp:0= ) - musepack? ( media-sound/musepack-tools:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - nfs? ( >=net-fs/libnfs-0.10.0:= ) - ogg? ( media-libs/libogg:0 ) - opencv? ( media-libs/opencv:0= ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= ) - postproc? ( libav? ( media-libs/libpostproc:0= ) ) - projectm? ( - media-fonts/dejavu:0 - media-libs/libprojectm:0 - ) - pulseaudio? ( media-sound/pulseaudio:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl-image? ( media-libs/sdl-image:0 ) - sftp? ( net-libs/libssh2:0 ) - shout? ( media-libs/libshout:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext:0 - x11-libs/libXinerama:0 - x11-libs/libXpm:0 - ) - soxr? ( media-libs/soxr ) - speex? ( - >=media-libs/speex-1.2.0:0 - media-libs/speexdsp:0 - ) - srt? ( net-libs/srt ) - ssl? ( net-libs/gnutls:0 ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo:0 - ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( media-libs/libtheora:0 ) - tremor? ( media-libs/tremor:0 ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) - ) - twolame? ( media-sound/twolame:0 ) - udev? ( virtual/udev:0 ) - upnp? ( net-libs/libupnp:= ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) - vdpau? ( x11-libs/libvdpau:0 ) - vnc? ( net-libs/libvncserver:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - wayland? ( - dev-libs/wayland - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi:0[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.19.8:* - virtual/pkgconfig:* - amd64? ( dev-lang/yasm:* ) - x86? ( dev-lang/yasm:* ) - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream - "${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798 -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - # https://bugs.gentoo.org/647668 - if use chromecast && ! use microdns; then - einfo "USE=microdns is required for Chromecast autodetection support" - fi -} - -src_prepare() { - default - - has_version '>=net-libs/libupnp-1.8.0' && \ - eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch - - # Bootstrap when we are on a git checkout. - if [[ ${PV} = *9999 ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - # Disable running of vlc-cache-gen, we do that in pkg_postinst - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die -} - -src_configure() { - local myeconfargs=( - --disable-aa - --disable-dependency-tracking - --disable-optimizations - --disable-update-check - --enable-fast-install - --enable-screen - --enable-vcd - --enable-vlc - $(use_enable a52) - $(use_enable alsa) - $(use_enable altivec) - $(use_enable aom) - $(use_enable archive) - $(use_enable bidi fribidi) - $(use_enable bidi harfbuzz) - $(use_enable bluray) - $(use_enable cddb libcddb) - $(use_enable chromaprint) - $(use_enable chromecast) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable dbus) - $(use_enable dbus kwallet) - $(use_enable dc1394) - $(use_enable debug) - $(use_enable directx) - $(use_enable directx d3d11va) - $(use_enable directx dxva2) - $(use_enable dts dca) - $(use_enable dvbpsi) - $(use_enable dvd dvdnav) - $(use_enable dvd dvdread) - $(use_enable encode sout) - $(use_enable encode vlm) - $(use_enable faad) - $(use_enable fdk fdkaac) - $(use_enable ffmpeg avcodec) - $(use_enable ffmpeg avformat) - $(use_enable ffmpeg swscale) - $(use_enable flac) - $(use_enable fluidsynth) - $(use_enable fontconfig) - $(use_enable gcrypt libgcrypt) - $(use_enable gme) - $(use_enable gnome-keyring secret) - $(use_enable gstreamer gst-decode) - $(use_enable ieee1394 dv1394) - $(use_enable jack) - $(use_enable jpeg) - $(use_enable kate) - $(use_enable libass) - $(use_enable libcaca caca) - $(use_enable libnotify notify) - $(use_enable libsamplerate samplerate) - $(use_enable libtar) - $(use_enable libtiger tiger) - $(use_enable linsys) - $(use_enable lirc) - $(use_enable live live555) - $(use_enable lua) - $(use_enable macosx-notifications osx-notifications) - $(use_enable macosx-qtkit) - $(use_enable matroska) - $(use_enable microdns) - $(use_enable modplug mod) - $(use_enable mp3 mad) - $(use_enable mpeg libmpeg2) - $(use_enable mtp) - $(use_enable musepack mpc) - $(use_enable ncurses) - $(use_enable neon) - $(use_enable ogg) - $(use_enable omxil) - $(use_enable omxil omxil-vout) - $(use_enable opencv) - $(use_enable optimisememory optimize-memory) - $(use_enable opus) - $(use_enable png) - $(use_enable postproc) - $(use_enable projectm) - $(use_enable pulseaudio pulse) - $(use_enable qt5 qt) - $(use_enable rdp freerdp) - $(use_enable rtsp realrtsp) - $(use_enable run-as-root) - $(use_enable samba smbclient) - $(use_enable schroedinger) - $(use_enable sdl-image) - $(use_enable sftp) - $(use_enable shout) - $(use_enable sid) - $(use_enable skins skins2) - $(use_enable soxr) - $(use_enable speex) - $(use_enable 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) - --disable-asdcp - --disable-coverage - --disable-cprof - --disable-crystalhd - --disable-decklink - --disable-gles2 - --disable-goom - --disable-kai - --disable-kva - --disable-libplacebo - --disable-maintainer-mode - --disable-merge-ffmpeg - --disable-mfx - --disable-mmal - --disable-opensles - --disable-oss - --disable-rpi-omxil - --disable-shine - --disable-sndio - --disable-spatialaudio - --disable-vsxu - --disable-wasapi - ) - # ^ We don't have these disabled libraries in the Portage tree yet. - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - - xdg_environment_reset # bug 608256 - - if use truetype || use bidi; then - myeconfargs+=( --enable-freetype ) - else - myeconfargs+=( --disable-freetype ) - fi - - if use truetype || use projectm; then - local dejavu="/usr/share/fonts/dejavu/" - myeconfargs+=( - --with-default-font=${dejavu}/DejaVuSans.ttf - --with-default-font-family=Sans - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace - ) - fi - - econf ${myeconfargs[@]} - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values may break the build (bug 523144), so definition should not be removed. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index a80409c4a816..9ee5edc366b8 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -36,7 +36,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg - taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx + 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=" @@ -194,6 +194,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) @@ -280,7 +281,6 @@ src_configure() { --disable-update-check --enable-fast-install --enable-screen - --enable-vcd --enable-vlc $(use_enable a52) $(use_enable alsa) @@ -380,6 +380,7 @@ src_configure() { $(use_enable upnp) $(use_enable v4l v4l2) $(use_enable vaapi libva) + $(use_enable vcd) $(use_enable vdpau) $(use_enable vnc) $(use_enable vorbis) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 2ee5c30ef9ca..a8bd9326940d 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -36,7 +36,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg - taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx + 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=" @@ -194,6 +194,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) @@ -279,7 +280,6 @@ src_configure() { --disable-update-check --enable-fast-install --enable-screen - --enable-vcd --enable-vlc $(use_enable a52) $(use_enable alsa) @@ -378,6 +378,7 @@ src_configure() { $(use_enable upnp) $(use_enable v4l v4l2) $(use_enable vaapi libva) + $(use_enable vcd) $(use_enable vdpau) $(use_enable vnc) $(use_enable vorbis) diff --git a/media-video/vobcopy/Manifest b/media-video/vobcopy/Manifest index ebffeaf8bbb7..84a2d8ceb935 100644 --- a/media-video/vobcopy/Manifest +++ b/media-video/vobcopy/Manifest @@ -1,3 +1,3 @@ DIST vobcopy-1.2.0.tar.bz2 60102 BLAKE2B 7456ded4df8c001678b0c61fedd66ef8f71ac98280894e803b64fccb96d5ed5e6fc44ef207e861c2f5a019f692aafaf676d718b8c1646bbbc48c6cfcc37a1fe5 SHA512 442849e0e4d379d6289011baa9074b89d579323d1d01faa1531f642d5dd4d25bd76b0286741e79da6e13f71b13ae8f86795c67059b47067d108b00a7b77945a5 -EBUILD vobcopy-1.2.0.ebuild 632 BLAKE2B 61219bb9a40f2b752ee0d4bc78cdb6c91a5372e80c680ea7c2ca5204529df0b4ce9ccc8fa4bef70461860ca52583845379717a952d9596352a1a41279ca19ec0 SHA512 5c6f2b40713c75694c37c7d5957d4f1cf5ba705169afb83c45de9b4063a438213b1635fdd23dbc5a52727a4d46712af6beca9b62922e85353064a31e605cb522 +EBUILD vobcopy-1.2.0.ebuild 665 BLAKE2B d4f34c9d198641e65cac68f089b0f508043d4315765ce6f7e2d9193e16262343e884fa4ff25ab9e95dd108d6236863b3a0adcd5943a1424082194676b4faa37f SHA512 c404d952748996a0a73c5c001f395e3cef860bb060dd7eaa9ec5827f8db7cff500d7de6ed0cf7e8cd26921e7ff49176bbf9d588cf3edaba4fcd354c25dffe62c MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-video/vobcopy/vobcopy-1.2.0.ebuild b/media-video/vobcopy/vobcopy-1.2.0.ebuild index f51dff5679b7..fe6ab57ce9e7 100644 --- a/media-video/vobcopy/vobcopy-1.2.0.ebuild +++ b/media-video/vobcopy/vobcopy-1.2.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=2 inherit toolchain-funcs +IUSE="" + DESCRIPTION="copies DVD .vob files to harddisk, decrypting them on the way" HOMEPAGE="http://lpn.rnbhq.org/" SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2" @@ -12,18 +13,17 @@ SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="" DEPEND=">=media-libs/libdvdread-0.9.4" -RDEPEND="" src_configure() { tc-export CC - ./configure.sh --with-lfs || die "Configure failed" + ./configure.sh --with-lfs } src_install() { - dobin vobcopy - doman vobcopy.1 - dodoc Changelog README Release-Notes TODO alternative_programs.txt + dobin vobcopy || die "dobin failed" + doman vobcopy.1 || die "doman failed" + dodoc Changelog README Release-Notes TODO alternative_programs.txt \ + || die "dodoc failed" } -- cgit v1.2.3