From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Dec 2017 20:48:53 +0000 Subject: gentoo resync : 23.12.2017 --- media-video/Manifest.gz | Bin 29745 -> 29747 bytes media-video/ffdiaporama/Manifest | 8 +- media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild | 2 +- .../ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild | 91 +++++ .../files/ffdiaporama-2.2-qt4multimedia.patch | 25 ++ media-video/minitube/Manifest | 2 +- media-video/minitube/metadata.xml | 4 - media-video/mpv/Manifest | 6 +- .../files/0.27.0/mpv-0.27.0-support-libva2.patch | 86 +++++ media-video/mpv/files/mpv-libva2.patch | 88 ----- media-video/mpv/mpv-0.27.0-r1.ebuild | 370 ++++++++++++++++++++ media-video/mpv/mpv-0.27.0.ebuild | 371 --------------------- media-video/mpv/mpv-9999.ebuild | 10 +- media-video/smplayer/Manifest | 8 +- media-video/smplayer/metadata.xml | 3 - media-video/smplayer/smplayer-16.11.0.ebuild | 148 -------- media-video/smplayer/smplayer-17.11.0.ebuild | 130 -------- media-video/smplayer/smplayer-17.11.2.ebuild | 2 +- 18 files changed, 592 insertions(+), 762 deletions(-) create mode 100644 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild create mode 100644 media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch create mode 100644 media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch delete mode 100644 media-video/mpv/files/mpv-libva2.patch create mode 100644 media-video/mpv/mpv-0.27.0-r1.ebuild delete mode 100644 media-video/mpv/mpv-0.27.0.ebuild delete mode 100644 media-video/smplayer/smplayer-16.11.0.ebuild delete mode 100644 media-video/smplayer/smplayer-17.11.0.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 0bbac115aee2..2b183b092950 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest index fa8426caed99..a4453bd4d491 100644 --- a/media-video/ffdiaporama/Manifest +++ b/media-video/ffdiaporama/Manifest @@ -1,10 +1,16 @@ AUX ffdiaporama-2.1-ffmpeg-2.4.patch 755 BLAKE2B 0a69dbb6ba4a6208461c1c5697fe732f2d3824e807f941e59714b6e32849c38e0919802043ffddb04f092749e821ad394079cbaa581102438ab9ed14648e7a32 SHA512 791a4885188536b4bfb5d4877783c887e1d457878c1d69d925c4e4257ae65864cc0a8eb1ab0063ea082ac13a57791147c16be80087b663fe81b1c8e68dbd8f38 AUX ffdiaporama-2.1-ffmpeg-3.0.patch 9617 BLAKE2B b270dbbb426c39a365e46b4ba93da6cc4f4f2dd9ed01710fc964e968d61ed99d7b59cd8fbdf5b6ac50b465b921656f1396c26727adf0eb1992ec3495da7e5ed3 SHA512 427df6b22b8c758d6e47a53de0219c1b84806cbb7b9bcdacff40e797e5d52fccd2f90ddba1aabe39f1c184628309d712ca521ad33bdabd0d07caead29b407399 +AUX ffdiaporama-2.2-qt4multimedia.patch 750 BLAKE2B bc1d45a21ec546dd15d2aa8a821610c52c6abade8cb903f3d1828ec078aaeffc196f04e9e194f2d825b0ac8e68381113ae9620197978e6bc5d7756681ba921d8 SHA512 9bd9ad4e0948b1bf31635c87473c901f306556bde8d39a1e660d0f6deca714607a6231b9ab5e8b756ec40c166b2226b238b6999ffb6848ec3718cfd052087a42 DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54 SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b +DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc +DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6 SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d +DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86 DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19 +DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5 DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473 -EBUILD ffdiaporama-2.1-r1.ebuild 2251 BLAKE2B 2efadabf5302d8dfe6cf293f61b9d380adeb47efd0cf1cec044f33b6875239aafa6298917a957dca2abc548683cbffdb048c55226d3f6ff97619f24d76cf6869 SHA512 31a139ae4667dd85da0e1760dbcbff2e6af1c658a98da6629e4de7d42007814b13db9fce59e0a20e6d969a00c2e2f92435a5265f4118cd4b2f90d7ca19cde650 +EBUILD ffdiaporama-2.1-r1.ebuild 2275 BLAKE2B b5216e5e6c85e2184cffa8364dc73116bcb3b4cb5026561630c5090d60ea8c57aa538bde441ddda3aaeea205d3561ced5b1726fb870b51304ffc37516505b1e2 SHA512 d235e42333d57429e6e03a41df3c7168d984c4a8ddfc16ddc0614bee0c79b49e3b342c6302fae27c3c625bacf5fbf1558c76f4efa969bfc1aa361efcfda8413f EBUILD ffdiaporama-2.1.ebuild 2163 BLAKE2B f3594ffa917a15ea0fb609224d48d90b222037032a3bfc3c4d33a28b31bfdd3ece5a6f9ef1c067318f97c3c8bce16f241f3d095f00f16511b4acff9aa6b683c6 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52 +EBUILD ffdiaporama-2.2_pre20140701.ebuild 2303 BLAKE2B 5995296adc68000b6d20b337f0d5b0c8ee76b7b8982602de7d842f699be860bf8d8795c851674f5d31836ddf14c1147d1e3ab31d7bf7ee1d62f68dea240c7453 SHA512 932d83e57f7fc6a097c46c129be6eaa69e01bf10d22481c9265eaf4d8f9eeb91359ee60709195d90db357dd76e286f363bb37f2fd0ed7c9cd10da94d052a018e MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild index ea066ecd17b2..da652736f010 100644 --- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild +++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild @@ -39,7 +39,7 @@ RDEPEND=" DEPEND="${RDEPEND}" DOCS=( authors.txt ) -PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10,ffmpeg-3.0}.patch ) +PATCHES=( "${DISTDIR}"/${P}-libav10.patch "${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch ) S="${WORKDIR}/ffDiaporama" diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild new file mode 100644 index 000000000000..1d9d671b5400 --- /dev/null +++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit xdg-utils gnome2-utils qmake-utils + +MY_PV=${PV%_pre20140701} +BIN_PV=${MY_PV}.devel.2014.0701 +RSC_PV=${MY_PV}.devel.2014.0503 +TMT_PV=1.0.2014.0125 +DESCRIPTION="Movie creator from photos and video clips" +HOMEPAGE="http://ffdiaporama.tuxfamily.org" +SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz + http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz + https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch + https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch + texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )" + +LICENSE="GPL-2 + texturemate? ( CC-BY-3.0 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libav openclipart qt5 texturemate" + +RDEPEND=" + media-gfx/exiv2 + media-libs/taglib + openclipart? ( media-gfx/openclipart[svg,-gzip] ) + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtmultimedia:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtxml:5 + ) + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qthelp:4 + dev-qt/qtmultimedia:4 + dev-qt/qtsql:4[sqlite] + dev-qt/qtsvg:4 + ) + libav? ( >=media-video/libav-11:0=[encode] ) + !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )" +DEPEND="${RDEPEND}" + +DOCS=( authors.txt ) +PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch "${FILESDIR}"/${PN}-${MY_PV}-qt4multimedia.patch ) + +S="${WORKDIR}/ffDiaporama" + +src_prepare() { + echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die + if use texturemate; then + echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die + fi + default_src_prepare +} + +src_configure() { + use qt5 && eqmake5 QMAKE_CFLAGS_ISYSTEM= + ! use qt5 && eqmake4 QMAKE_CFLAGS_ISYSTEM= +} + +src_install() { + emake INSTALL_ROOT="${D}" install + if use openclipart; then + dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch new file mode 100644 index 000000000000..6dd0367337e2 --- /dev/null +++ b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch @@ -0,0 +1,25 @@ +--- ffDiaporama.ori/src/ffDiaporama/ffDiaporama.pro 2014-05-04 10:33:56.000000000 +0200 ++++ ffDiaporama/src/ffDiaporama/ffDiaporama.pro 2016-12-06 00:03:27.392114339 +0100 +@@ -26,19 +26,13 @@ + + greaterThan(QT_MAJOR_VERSION,4) { + # QT5 version +- QT += widgets concurrent help multimedia ++ QT += widgets concurrent help + } else { + # QT4 version +- CONFIG += help mobility +- MOBILITY = multimedia +- +- unix { +- INCLUDEPATH += /usr/include/QtMultimediaKit +- INCLUDEPATH += /usr/include/QtMobility +- } ++ CONFIG += help multimedia + } + +-QT += core gui xml network svg sql ++QT += core gui xml multimedia network svg sql + QMAKE_STRIP = echo + APPFOLDER = ffDiaporama + TARGET = ffDiaporama diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest index adc81bbb42ba..58de0be66b95 100644 --- a/media-video/minitube/Manifest +++ b/media-video/minitube/Manifest @@ -1,4 +1,4 @@ AUX minitube-2.5.1-disable-updates.patch 205 BLAKE2B 8cde17ebbedfc986c056fe3f3d54f988d39f4fa71251626d09f074e0fb72e3c313abceb510fc8afc182f16edddb3a334a29360a9307fa94d2ed865a2920341e9 SHA512 9b257652feea431d6ee115fab3ba89f07fd85163290782610b504fa7d556d03a547554d1ede10edd670b98b4b0f042d67cbf546bfcc6e07a8028de42a58b3384 DIST minitube-2.5.2.tar.gz 1063794 BLAKE2B 511923c85efc8f4b8db621047d1887d54f518ef7f01fa1dc76a05bbc4bc8e1e0038318d2fee280b6e0f06a5e1d46e02ddc547a60f62086ea24ad28849ec728a3 SHA512 4001ea95e6d3b541e9a8a2555830238f6e3a0b4749566dfd67ae48fdc6102ec77a38e162e04fb2637cc5ff2b3dccdca541119531302332ffa3b90d9db8809284 EBUILD minitube-2.5.2-r1.ebuild 2526 BLAKE2B 85426efeeff48fd10df5ad1887d9bef5c27f9876d402d3dd3b2f1e0cd3640e85b047cc112686681b52f38710ad09486d7789ac0dddd64a0ceb2879113d4bfd7a SHA512 aca169730389b992cf93a196510ada5e9eb9d4b3a8f8db71f0fdc5583fbd82fdccb381d4302c71ac33b710e30e2f2f0646f345d6c6584aba5fcc95e10b6539e5 -MISC metadata.xml 546 BLAKE2B 5dfe9857caa8f15891ace0c8748db2da5ee110ec7ad12d4ca554d0c5a66fd9f478ee4a508030f646039860442c324cc3aa6fc1fa188346b5272d1af3c504b580 SHA512 b4b597d562b7cd43306a61e871cc853af153f17acf2e69cdbc148dbb4672648e86e1d4869ae098f91f133aacc6206df6c0f4f9a4d47220c39b39b6746929268b +MISC metadata.xml 438 BLAKE2B e046cab12e70ee456f4cdac49a0d107ed8edf4ecd51e772a8c88ed45229a3d74e90be842c166c7e9001bf7f28625460f2b2ac01c6db2dd4384d3b70eb229b8ca SHA512 d8ba4788ad9a08c54cb75b509bedc74c06de3542f4048b996583608a8035ec256a2868faa752d1bbcac703dfdf26b21184ffd237518acc5fbf0fca9489f8801b diff --git a/media-video/minitube/metadata.xml b/media-video/minitube/metadata.xml index bb2aac781b2e..fb12418babd2 100644 --- a/media-video/minitube/metadata.xml +++ b/media-video/minitube/metadata.xml @@ -1,10 +1,6 @@ - - qt@gentoo.org - Gentoo Qt Project - media-video@gentoo.org Gentoo Video project diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 8399963fa8be..07e6f5a92af9 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -5,9 +5,9 @@ AUX 0.18.0/mpv-0.18.0-fix-initial-av-sync.patch 1590 BLAKE2B a9ec7dbcbcdaf8f7a30 AUX 0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch 1456 BLAKE2B e74c5828301daa303ee1fa826b96b06827ca6fa8fc9652cb6cd6f6e1fd82e002f4023a97c239cf332881a4f6686ea9b9d786d31e57fea7c1e06edecfc5877c2a SHA512 42cb00778b84157eff45d5143c3e1a232f7c98377d33aa9dbbb30122e678458168fe651b959656f00916a86069b727e814a6b8a9a7d10cd58f45dace2db32ef7 AUX 0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch 2102 BLAKE2B 507ffa5983e2988889f82de786771bc4ff8ba6d5c7ca32cf16443e76906a93a101861098aa5e5c58c48b0eeeac0db74e787b1a8b452115d1ce45888d6ac37e5c SHA512 b2bfcb9529e2b90f786b3277a54018dedc3d8f38db5bf1f45c2df365ea297f05fc93524d225a308078b353f7be3c830e4091070a30a6ca30d767b8d207cb01bd AUX 0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch 996 BLAKE2B 67988decbfe56b78541ba8786d4a12d124177278b424fad796ce814bb3befefce9dd9ffa7048eb727676769f3273a35137b184151ad1f1f9bdaf73c22bbf6fdd SHA512 cb2e04515da4f4d1154f489327ec282b75e71c8257477ac2f2602bb21b7c2765b2b6ebc7e5c7e1f6a57f271a804e694a9bf8dd25aa71b34fa13ab7a0ee21283e +AUX 0.27.0/mpv-0.27.0-support-libva2.patch 2918 BLAKE2B c9e217ebc0e42b56c327f8437a396dcb523ceeba3d2c2684a62babacb6bd3db636cd2e23e3311e0c57000e261f74b7c693aa128eedbb9b3f6f48d85e04beca3a SHA512 ece9f59d7875ba881bc9e913c3e44449401e0cc0bcfd46493f4c0d167e853bac9033fd7af2c15056768289709ec2a8d6b54c571360c140bbec3fd9d947c6b50b AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470830fd2c76cc75a1712976112bdfc8269d04ec42de054d1f63d3e028b9ee61adc7d49500479f0f14955a627a34d797b512a9a9f976bc6b45b1e47b6 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e -AUX mpv-libva2.patch 3067 BLAKE2B 747aca22b0d065f7486d7fd18f88b14f8d42d571909b59d32cc9d0e80b0f2e086b9b9407da2cce73f1b0fcabc68597e44896461900f340f17bc6a1dcf862bdd2 SHA512 43e89cf7e939cc30c4a70172f06d652005a251350dfc9335d51dde981f177b656bf3cf8f3eaa1a2b19fc563e9a09f6e32843eff2105fab7e3d9e10f3b2245f84 DIST mpv-0.18.0.tar.gz 2758960 BLAKE2B 5ab201a9c8ed34d2a880cc8f81426ff130ae74867e6ed4d1475f47da8ae3d62be8df9fd3e1476f4f15d1721c05f1972cb1c6c9e0ade6b27d0732b1946f0ed4a6 SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf @@ -18,6 +18,6 @@ DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28f EBUILD mpv-0.18.0-r1.ebuild 8452 BLAKE2B 0d6b675cba5587a1330991c634af72b537a80130045fa8784816a48062cb7870e434fbf721515b23ba16f328788781ba5052d53bf449934389984b9d43c6a330 SHA512 67506868d59230a1333fb89822e7c3d6e8652bc43c53c1c41afd980d5b6f76e01a64ee39a9f0debcb57cad000aa141b8f2dd5d909157072f1abc2ca00600725e EBUILD mpv-0.25.0-r2.ebuild 10838 BLAKE2B 38cf2272870a4c0ca913ff007bd7e86c892039308f1b3067001bf873d8e01e87756a2579f47e0b73c7c7cc047f0775c9ea30ad14ae1aff1ba5cbb08cd7234e45 SHA512 328533ba4c5a9714a604b6d71da5dcd076113988382e17406f5fb88f11eba83a7ad7b25ab59aff86de6d1b42f0878edc2eef953f17d337bdaa1e3f15189ec4e0 EBUILD mpv-0.26.0.ebuild 10557 BLAKE2B 2c330a98e946fd306144b6fa1f8554c93aabad75f64d286681257ce991ce9e1be37e0789ae960532c039ea3ac2623becfa6c7eea4b67cde277ce558808437930 SHA512 ffda8bdf4691643e6619334fe1b401c367c8ce7a0a3bc61494a27ad888c8121d045d22111bb98c72551a15d5dbf6e3b34252681a8642be8fa92785cb2b40944e -EBUILD mpv-0.27.0.ebuild 10574 BLAKE2B 44c460e40d17ded0390b313205d422b0ce2856d1c1ad12d30b39d9074a6461b2aaa13d7a4813435ce37db4c71cd1f6eef17c7e1643f34b7b5db0763e548f87f0 SHA512 9586ad9690831638b06bda9dec462b8ea04374b71b14d2b2912baacf0c80ce921bc761956ff738c8d56cd9d6b7706fa60dc6feb35bd3ffa584514757fc44167d -EBUILD mpv-9999.ebuild 10304 BLAKE2B 9b6844079a0acfcb8104344cf69bc6f4ec664b56b5f7fd999d513694b4a3c62f5ff5c37f9aefa3df9e5cf34019b378af9e8cbcfb54af2f626f617162df9b0db8 SHA512 95e78b3e28ba92932da3d2325ae4c3712584885b4a96fcf10aab2d749d6fefb57b70ec7cfe8083df3b9dabbcaaec32865242ef5ec07c95318ad8981c8e81485d +EBUILD mpv-0.27.0-r1.ebuild 10546 BLAKE2B 03096c1e04283da1c0deb3c31a68d6289d2dff7ce40d94027def753364e0cb0db64985fbe7aacb04740bafcaf1552979bd34d045700226f5206017a2500ae376 SHA512 a1fed55edbb1e93e10821f8ff78911cf3c8b2fad285b90b78ecc46f271e7c872d4066d2163b716eeb2de8c96f200cf053ad70a4a2e962769e00dc23781da22c3 +EBUILD mpv-9999.ebuild 10286 BLAKE2B 8866ee5e4817eeeabed02799640ff4390ecc32c922d255052e4a2d171e157296c71b8438fb6ea9a0ed2276c54a38e9dc320cfb9ffc27f0625c3a5630051d1e15 SHA512 dd71019d9a8533a475c1bae6c7d720b4b59b72b7f2d031e314c9bebc810446d2f3a27b6c7376e6d498b7965b1c8bb9c6a9cc21306dd8528866b3bbfd1a3d3486 MISC metadata.xml 2605 BLAKE2B f904ae1613a39130a0cf0b5c784e8f20e698548bff742f9bacda64b2337cb1f8a8995bcc6402fb56e7a5a18d26938c6a964619a9c51962f72e7c092ee968fcf7 SHA512 44088b7e21ef2adb8b69cdb9b7bb3db9874f5c4cf5668d8adca219f0ae7e3b8ae6c0d329ad8489bbf3a95ec5333455d95209d897f239a9c015c6c97acb7f8826 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch new file mode 100644 index 000000000000..8ae7f537682f --- /dev/null +++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch @@ -0,0 +1,86 @@ +commit 2ecf240b1cd20875991a5b18efafbe799864ff7f +Author: Mark Thompson +Date: Mon Oct 9 20:10:26 2017 +0100 + +vaapi: Use libva2 message callbacks + +They are no longer global, so they work vaguely sensibly. + +diff --git a/video/vaapi.c b/video/vaapi.c +index 6bedbbaa18..3b1cb9cc41 100644 +--- a/video/vaapi.c ++++ b/video/vaapi.c +@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) + return 0; + } + +-// VA message callbacks are global and do not have a context parameter, so it's +-// impossible to know from which VADisplay they originate. Try to route them +-// to existing mpv/libmpv instances within this process. ++#if VA_CHECK_VERSION(1, 0, 0) ++static void va_message_callback(void *context, const char *msg, int mp_level) ++{ ++ struct mp_vaapi_ctx *res = context; ++ mp_msg(res->log, mp_level, "libva: %s", msg); ++} ++ ++static void va_error_callback(void *context, const char *msg) ++{ ++ va_message_callback(context, msg, MSGL_ERR); ++} ++ ++static void va_info_callback(void *context, const char *msg) ++{ ++ va_message_callback(context, msg, MSGL_V); ++} ++#else ++// Pre-libva2 VA message callbacks are global and do not have a context ++// parameter, so it's impossible to know from which VADisplay they ++// originate. Try to route them to existing mpv/libmpv instances within ++// this process. + static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER; + static struct mp_vaapi_ctx **va_mpv_clients; + static int num_va_mpv_clients; +@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg) + { + va_message_callback(msg, MSGL_V); + } ++#endif + + static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) + { +@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, + }, + }; + ++#if VA_CHECK_VERSION(1, 0, 0) ++ vaSetErrorCallback(display, va_error_callback, res); ++ vaSetInfoCallback(display, va_info_callback, res); ++#else + pthread_mutex_lock(&va_log_mutex); + MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res); + pthread_mutex_unlock(&va_log_mutex); +@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, + #ifdef VA_FOURCC_I010 + vaSetErrorCallback(va_error_callback); + vaSetInfoCallback(va_info_callback); ++#endif + #endif + + int major, minor; +@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) + if (ctx->destroy_native_ctx) + ctx->destroy_native_ctx(ctx->native_ctx); + ++#if !VA_CHECK_VERSION(1, 0, 0) + pthread_mutex_lock(&va_log_mutex); + for (int n = 0; n < num_va_mpv_clients; n++) { + if (va_mpv_clients[n] == ctx) { +@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) + if (num_va_mpv_clients == 0) + TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors + pthread_mutex_unlock(&va_log_mutex); ++#endif + + talloc_free(ctx); + } diff --git a/media-video/mpv/files/mpv-libva2.patch b/media-video/mpv/files/mpv-libva2.patch deleted file mode 100644 index 843e84494541..000000000000 --- a/media-video/mpv/files/mpv-libva2.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001 -From: Mark Thompson -Date: Mon, 9 Oct 2017 20:10:26 +0100 -Subject: [PATCH] vaapi: Use libva2 message callbacks - -They are no longer global, so they work vaguely sensibly. ---- - video/vaapi.c | 32 +++++++++++++++++++++++++++++--- - 1 file changed, 29 insertions(+), 3 deletions(-) - -diff --git a/video/vaapi.c b/video/vaapi.c -index 6bedbbaa18..3b1cb9cc41 100644 ---- a/video/vaapi.c -+++ b/video/vaapi.c -@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) - return 0; - } - --// VA message callbacks are global and do not have a context parameter, so it's --// impossible to know from which VADisplay they originate. Try to route them --// to existing mpv/libmpv instances within this process. -+#if VA_CHECK_VERSION(1, 0, 0) -+static void va_message_callback(void *context, const char *msg, int mp_level) -+{ -+ struct mp_vaapi_ctx *res = context; -+ mp_msg(res->log, mp_level, "libva: %s", msg); -+} -+ -+static void va_error_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_ERR); -+} -+ -+static void va_info_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_V); -+} -+#else -+// Pre-libva2 VA message callbacks are global and do not have a context -+// parameter, so it's impossible to know from which VADisplay they -+// originate. Try to route them to existing mpv/libmpv instances within -+// this process. - static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER; - static struct mp_vaapi_ctx **va_mpv_clients; - static int num_va_mpv_clients; -@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg) - { - va_message_callback(msg, MSGL_V); - } -+#endif - - static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) - { -@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - }, - }; - -+#if VA_CHECK_VERSION(1, 0, 0) -+ vaSetErrorCallback(display, va_error_callback, res); -+ vaSetInfoCallback(display, va_info_callback, res); -+#else - pthread_mutex_lock(&va_log_mutex); - MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res); - pthread_mutex_unlock(&va_log_mutex); -@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - #ifdef VA_FOURCC_I010 - vaSetErrorCallback(va_error_callback); - vaSetInfoCallback(va_info_callback); -+#endif - #endif - - int major, minor; -@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (ctx->destroy_native_ctx) - ctx->destroy_native_ctx(ctx->native_ctx); - -+#if !VA_CHECK_VERSION(1, 0, 0) - pthread_mutex_lock(&va_log_mutex); - for (int n = 0; n < num_va_mpv_clients; n++) { - if (va_mpv_clients[n] == ctx) { -@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (num_va_mpv_clients == 0) - TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors - pthread_mutex_unlock(&va_log_mutex); -+#endif - - talloc_free(ctx); - } diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild new file mode 100644 index 000000000000..fd90c09f204f --- /dev/null +++ b/media-video/mpv/mpv-0.27.0-r1.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV=1.9.8 + +inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils + +DESCRIPTION="Media player based on MPlayer and mplayer2" +HOMEPAGE="https://mpv.io/" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" + DOCS=( RELEASE_NOTES ) +else + EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" + inherit git-r3 +fi +SRC_URI+=" https://waf.io/waf-${WAF_PV}" +DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) + +# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. +LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" +SLOT="0" +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb + dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca + libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband + samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib + zsh-completion" + +REQUIRED_USE=" + || ( cli libmpv ) + aqua? ( opengl ) + cuda? ( !libav opengl ) + egl? ( || ( gbm X wayland ) ) + gbm? ( drm egl opengl ) + lcms? ( opengl ) + luajit? ( lua ) + opengl? ( || ( aqua egl X raspberry-pi !cli ) ) + raspberry-pi? ( opengl ) + test? ( opengl ) + tools? ( cli ) + uchardet? ( iconv ) + v4l? ( || ( alsa oss ) ) + vaapi? ( || ( gbm X wayland ) ) + vdpau? ( X ) + wayland? ( egl ) + X? ( egl? ( opengl ) ) + xv? ( X ) + zsh-completion? ( cli ) + ${PYTHON_REQUIRED_USE} +" + +COMMON_DEPEND=" + !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) + alsa? ( >=media-libs/alsa-lib-1.0.18 ) + archive? ( >=app-arch/libarchive-3.0.0:= ) + bluray? ( >=media-libs/libbluray-0.3.0:= ) + cdda? ( dev-libs/libcdio-paranoia ) + cuda? ( >=media-video/ffmpeg-3.3:0 ) + drm? ( x11-libs/libdrm ) + dvd? ( + >=media-libs/libdvdnav-4.2.0 + >=media-libs/libdvdread-4.1.0 + ) + egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + iconv? ( + virtual/libiconv + uchardet? ( app-i18n/uchardet ) + ) + jack? ( virtual/jack ) + javascript? ( >=dev-lang/mujs-1.0.0 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( >=media-libs/lcms-2.6:2 ) + libass? ( + >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] + virtual/ttf-fonts + ) + libcaca? ( >=media-libs/libcaca-0.99_beta18 ) + lua? ( + !luajit? ( =media-libs/openal-1.13 ) + pulseaudio? ( media-sound/pulseaudio ) + raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) + rubberband? ( >=media-libs/rubberband-1.8.0 ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl2[sound,threads,video] ) + v4l? ( media-libs/libv4l ) + vaapi? ( + !libav? ( >=media-video/ffmpeg-3.3:0 ) + libav? ( >=media-video/libav-13:0 ) + x11-libs/libva:=[drm?,X?,wayland?] + ) + vdpau? ( + !libav? ( >=media-video/ffmpeg-3.3:0 ) + libav? ( >=media-video/libav-13:0 ) + x11-libs/libvdpau + ) + wayland? ( + >=dev-libs/wayland-1.6.0 + >=x11-libs/libxkbcommon-0.3.0 + ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + opengl? ( + x11-libs/libXdamage + virtual/opengl + ) + xv? ( x11-libs/libXv ) + ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + dev-python/docutils + virtual/pkgconfig + doc? ( dev-python/rst2pdf ) + dvb? ( virtual/linuxtv-dvb-headers ) + test? ( >=dev-util/cmocka-1.0.0 ) + v4l? ( virtual/os-headers ) + zsh-completion? ( dev-lang/perl ) +" +RDEPEND="${COMMON_DEPEND} + cuda? ( x11-drivers/nvidia-drivers[X] ) + selinux? ( sec-policy/selinux-mplayer ) + tools? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" +) + +pkg_setup() { + [[ ${MERGE_TYPE} != "binary" ]] && python_setup +} + +src_prepare() { + cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die + chmod +x "${S}"/waf || die + eapply "${FILESDIR}/${PV}" + default_src_prepare +} + +src_configure() { + tc-export CC PKG_CONFIG AR + + if tc-is-cross-compiler && use raspberry-pi; then + export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" + # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. + die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." + fi + + local mywafargs=( + --confdir="${EPREFIX}/etc/${PN}" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + + $(usex cli '' '--disable-cplayer') + $(use_enable libmpv libmpv-shared) + + --disable-libmpv-static + --disable-static-build + # See deep down below for build-date. + --disable-optimize # Don't add '-O2' to CFLAGS. + --disable-debug-build # Don't add '-g' to CFLAGS. + --enable-html-build + + $(use_enable doc pdf-build) + $(use_enable cplugins) + $(use_enable zsh-completion zsh-comp) + $(use_enable test) + + --disable-android + $(use_enable iconv) + $(use_enable samba libsmbclient) + $(use_enable lua) + $(usex luajit '--lua=luajit' '') + $(use_enable javascript) + $(use_enable libass) + $(use_enable libass libass-osd) + $(use_enable zlib) + $(use_enable encode encoding) + $(use_enable bluray libbluray) + $(use_enable dvd dvdread) + $(use_enable dvd dvdnav) + $(use_enable cdda) + $(use_enable uchardet) + $(use_enable rubberband) + $(use_enable lcms lcms2) + --disable-vapoursynth # Only available in overlays. + --disable-vapoursynth-lazy + $(use_enable archive libarchive) + + --enable-libavdevice + + # Audio outputs: + $(use_enable sdl sdl2) # Listed under audio, but also includes video. + --disable-sdl1 + $(use_enable oss oss-audio) + --disable-rsound # Only available in overlays. + --disable-sndio # Only available in overlays. + $(use_enable pulseaudio pulse) + $(use_enable jack) + $(use_enable openal) + --disable-opensles + $(use_enable alsa) + $(use_enable coreaudio) + + # Video outputs: + $(use_enable aqua cocoa) + $(use_enable drm) + $(use_enable gbm) + $(use_enable wayland) + $(use_enable X x11) + $(use_enable xv) + $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') + $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') + $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') + $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') + $(use_enable vdpau) + $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. + $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') + $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') + $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') + $(use_enable libcaca caca) + $(use_enable jpeg) + $(use_enable raspberry-pi rpi) + $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') + --disable-mali-fbdev # Only available in overlays. + $(usex opengl '' '--disable-gl') + + # HWaccels: + # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. + $(use_enable vaapi vaapi-hwaccel) + $(use_enable vdpau vdpau-hwaccel) + $(use_enable cuda cuda-hwaccel) + + # TV features: + $(use_enable v4l tv) + $(use_enable v4l tv-v4l2) + $(use_enable v4l libv4l2) + $(use_enable v4l audio-input) + $(use_enable dvb dvbin) + + # Miscellaneous features: + --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + ) + + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl vaapi-x-egl) + ) + fi + + # Create reproducible non-live builds. + [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) + + waf-utils_src_configure "${mywafargs[@]}" +} + +src_install() { + waf-utils_src_install + + if use lua; then + insinto /usr/share/${PN} + doins -r TOOLS/lua + fi + + if use cli && use luajit; then + pax-mark -m "${ED}"usr/bin/${PN} + fi + + if use tools; then + dobin TOOLS/{mpv_identify.sh,umpv} + newbin TOOLS/idet.sh mpv_idet.sh + python_replicate_script "${ED}"usr/bin/umpv + fi +} + +pkg_postinst() { + local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 + + for rv in ${REPLACING_VERSIONS}; do + version_compare ${rv} 0.18.1 + [[ $? -eq 1 ]] && softvol_0_18_1=1 + version_compare ${rv} 0.21.0 + [[ $? -eq 1 ]] && osc_0_21_0=1 + version_compare ${rv} 0.24.0 + [[ $? -eq 1 ]] && txtsubs_0_24_0=1 + version_compare ${rv} 0.25.0 + [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 + done + + if [[ ${softvol_0_18_1} -eq 1 ]]; then + elog "Since version 0.18.1 the software volume control is always enabled." + elog "This means that volume controls don't change the system volume," + elog "e.g. per-application volume with PulseAudio." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" + elog + fi + + if [[ ${osc_0_21_0} -eq 1 ]]; then + elog "In version 0.21.0 the default OSC layout was changed." + elog "If you want to restore the previous layout, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" + elog + fi + + if [[ ${txtsubs_0_24_0} -eq 1 ]]; then + elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" + elog + fi + + if [[ ${opengl_0_25_0} -eq 1 ]]; then + elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" + elog "the 'opengl' video output and no longer explicitly requires" + elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." + fi + + if use cli && ! has_version 'app-shells/mpv-bash-completion'; then + elog "If you want to have command-line completion via bash-completion," + elog "please install app-shells/mpv-bash-completion." + fi + + if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ + has_version 'app-shells/mpv-bash-completion'; then + elog "If command-line completion doesn't work after mpv update," + elog "please rebuild app-shells/mpv-bash-completion." + fi + + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +src_test() { + cd "${S}"/build/test || die + local test + for test in *; do + if [[ -x ${test} ]]; then + ./"${test}" || die "Test suite failed" + fi + done +} diff --git a/media-video/mpv/mpv-0.27.0.ebuild b/media-video/mpv/mpv-0.27.0.ebuild deleted file mode 100644 index 0edb3df22f3a..000000000000 --- a/media-video/mpv/mpv-0.27.0.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=1.9.8 - -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" - inherit git-r3 -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib - zsh-completion" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - cuda? ( !libav opengl ) - egl? ( || ( gbm X wayland ) ) - gbm? ( drm egl opengl ) - lcms? ( opengl ) - luajit? ( lua ) - opengl? ( || ( aqua egl X raspberry-pi !cli ) ) - raspberry-pi? ( opengl ) - test? ( opengl ) - tools? ( cli ) - uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - wayland? ( egl ) - X? ( egl? ( opengl ) ) - xv? ( X ) - zsh-completion? ( cli ) - ${PYTHON_REQUIRED_USE} -" - -COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.0.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0:= ) - cdda? ( dev-libs/libcdio-paranoia ) - cuda? ( >=media-video/ffmpeg-3.3:0 ) - drm? ( x11-libs/libdrm ) - dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - iconv? ( - virtual/libiconv - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( - !luajit? ( =media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) - vaapi? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libva[drm?,X?,wayland?] - ) - vdpau? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libvdpau - ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=x11-libs/libxkbcommon-0.3.0 - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) - xv? ( x11-libs/libXv ) - ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-python/docutils - virtual/pkgconfig - doc? ( dev-python/rst2pdf ) - dvb? ( virtual/linuxtv-dvb-headers ) - test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) -" -RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) - selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" - "${FILESDIR}/${PN}-libva2.patch" #641384 -) - -pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && python_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - eapply "${FILESDIR}/${PV}" - default -} - -src_configure() { - tc-export CC PKG_CONFIG AR - - if tc-is-cross-compiler && use raspberry-pi; then - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." - fi - - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build - - $(use_enable doc pdf-build) - $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) - $(use_enable test) - - --disable-android - $(use_enable iconv) - $(use_enable samba libsmbclient) - $(use_enable lua) - $(usex luajit '--lua=luajit' '') - $(use_enable javascript) - $(use_enable libass) - $(use_enable libass libass-osd) - $(use_enable zlib) - $(use_enable encode encoding) - $(use_enable bluray libbluray) - $(use_enable dvd dvdread) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - --disable-sndio # Only available in overlays. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. - $(usex opengl '' '--disable-gl') - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable vaapi vaapi-hwaccel) - $(use_enable vdpau vdpau-hwaccel) - $(use_enable cuda cuda-hwaccel) - - # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) - $(use_enable dvb dvbin) - - # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - ) - - if use vaapi && use X; then - mywafargs+=( - $(use_enable opengl vaapi-glx) - $(use_enable egl vaapi-x-egl) - ) - fi - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use lua; then - insinto /usr/share/${PN} - doins -r TOOLS/lua - fi - - if use cli && use luajit; then - pax-mark -m "${ED}"usr/bin/${PN} - fi - - if use tools; then - dobin TOOLS/{mpv_identify.sh,umpv} - newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"usr/bin/umpv - fi -} - -pkg_postinst() { - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 - - for rv in ${REPLACING_VERSIONS}; do - version_compare ${rv} 0.18.1 - [[ $? -eq 1 ]] && softvol_0_18_1=1 - version_compare ${rv} 0.21.0 - [[ $? -eq 1 ]] && osc_0_21_0=1 - version_compare ${rv} 0.24.0 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1 - version_compare ${rv} 0.25.0 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 - done - - if [[ ${softvol_0_18_1} -eq 1 ]]; then - elog "Since version 0.18.1 the software volume control is always enabled." - elog "This means that volume controls don't change the system volume," - elog "e.g. per-application volume with PulseAudio." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" - elog - fi - - if [[ ${osc_0_21_0} -eq 1 ]]; then - elog "In version 0.21.0 the default OSC layout was changed." - elog "If you want to restore the previous layout, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" - elog - fi - - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" - elog - fi - - if [[ ${opengl_0_25_0} -eq 1 ]]; then - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" - elog "the 'opengl' video output and no longer explicitly requires" - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." - fi - - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then - elog "If you want to have command-line completion via bash-completion," - elog "please install app-shells/mpv-bash-completion." - fi - - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ - has_version 'app-shells/mpv-bash-completion'; then - elog "If command-line completion doesn't work after mpv update," - elog "please rebuild app-shells/mpv-bash-completion." - fi - - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 32de4217994a..1543eb4db2e5 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -93,11 +93,12 @@ COMMON_DEPEND=" samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva[drm?,X?,wayland?] ) + vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 + dev-libs/wayland-protocols ) X? ( x11-libs/libX11 @@ -140,7 +141,7 @@ pkg_setup() { src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die - default + default_src_prepare } src_configure() { @@ -193,7 +194,6 @@ src_configure() { --disable-vapoursynth-lazy $(use_enable archive libarchive) - --enable-ffmpeg-upstream --enable-libavdevice # Audio outputs: @@ -213,6 +213,8 @@ src_configure() { $(use_enable aqua cocoa) $(use_enable drm) $(use_enable gbm) + $(use_enable wayland wayland-scanner) + $(use_enable wayland wayland-protocols) $(use_enable wayland) $(use_enable X x11) $(use_enable xv) @@ -233,8 +235,6 @@ src_configure() { $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') --disable-mali-fbdev # Only available in overlays. $(usex opengl '' '--disable-gl') - --disable-vulkan # Requires glslang and spirv-tools packaged. - --disable-shaderc # Only available in overlays. # HWaccels: # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 63502d34ebf3..56d4268a88d2 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -1,10 +1,6 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc96833566d3d87d0bde532b0b6a6500671d9ec75cc0ee5f9485ea052ad030f8237d01184200f846febc07f4d7195af15d379e589de6772d58d4cfe89bff8ac3 SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9 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-16.11.0.tar.bz2 4254170 BLAKE2B fdae4c9183d6f2e768625096940f081123a6ab08b8c83c38b21ec33d7fb4af18715d705a116233436392c274397cd259117056779c6371b49ebbf484a2f168c7 SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c -DIST smplayer-17.11.0.tar.bz2 5033817 BLAKE2B 4cb853c2ee6596037ccb88d248d2bbf470eabebc2c2c91c03cf27752639e0550623d1e68a21f18619b58d6993f86ffe73738a84549c40f79ee136fe8e9b4aa8a SHA512 a51b49f92da21abe0a81bb07db5b5dd13d80ee86a488783acf8bacbe389dffb7dac123780d7492d2b20cdaf6727a9672d89c7d09d18674fc142ba2aa65a21754 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81 -EBUILD smplayer-16.11.0.ebuild 3501 BLAKE2B 9722290689cf6ec87509ca343842426292587d47eb85645682531f61bad366b0026d4bccd3302b5b2dc6f0d0740662e52b9f3bec77284ae5a4cb6daae90e1d1c SHA512 0e28a728350d06be20f0be25a2a11b4a3b4aae59208bbc0c9ade099fdea35bc74ae0186a64faba4d06470ce6a6269b40c597c86f02bc903dd0f6cc113dfd2f54 -EBUILD smplayer-17.11.0.ebuild 3019 BLAKE2B 1aa48121c5e1c011a63f4a842ac257294f6b498b9c686a40851d8bbd52ecb42d366dd4196d6d69c2a80226ffa76d77aeee463995ca4d848f55607b2e6ecaafe5 SHA512 66c4b82306e08ce4795c6afad4bb412f86c3a162fa4f4be499910ea78e546fc55db2878190653c988e3a949fa8b17bb823aa4f7885dc1688aa54d16773941e51 -EBUILD smplayer-17.11.2.ebuild 3020 BLAKE2B 46919ea0eac2a4c50a48da344850ed881ae9e93720f9ca8c76d25fc911bd7afef3eda1eb6d2795124a3d5686d6f2facbd4069bc4b32a8580c8ca390e33e1cb9d SHA512 acd70c7c17ab8c1b749d9f2e51877347c59c31c6b0e7178e1586f1cce902ef4cc2749b4815576de3660317f8ed4790b56bc91edab9c3ce90bd83e04b673625ba -MISC metadata.xml 1016 BLAKE2B 52a19c575fe59fe115fb8eba5039c66c584907292b21a6f79b9e168381f2e604cacc71fe6d2f0f5103ec1cf64549658a54892725993c1c2f4c9d575a9c1866ef SHA512 04fb5a1a6c330b847e43a6e6a635be5180e4bb353b28c551f39ca74c663874e36f697204d01fb0267775c04ec452fbb5409e7d5611b61bd7f883ee1f9c8b82fc +EBUILD smplayer-17.11.2.ebuild 3018 BLAKE2B 7817664c0e229b77c508b7fe24775a26266a8d4e91f9d3b9daa0ef4399f45c9c66d999f5b82f09e5872f381f76dd8d3df7bf38af0c88e2650deec33f5a736678 SHA512 f91392e1a442f48103b5d35765e7821b253d16e528f53ab903ed4ac2fd7ea2c05695120bd14c8288b89ed2b396a3ce024c250ef04472617b9d87ab0ca92a209e +MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml index 9f32889eaddc..48ba551d7671 100644 --- a/media-video/smplayer/metadata.xml +++ b/media-video/smplayer/metadata.xml @@ -18,9 +18,6 @@ Interfacing Specification, version 2), a DBus interface for remote control, which requires dev-qt/qtdbus as dependency. - Support for streaming video sites through - net-misc/youtube-dl (MPV only). - smplayer diff --git a/media-video/smplayer/smplayer-16.11.0.ebuild b/media-video/smplayer/smplayer-16.11.0.ebuild deleted file mode 100644 index 62806f4d7de7..000000000000 --- a/media-video/smplayer/smplayer-16.11.0.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# 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 - -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 qt5 streaming" - -COMMON_DEPEND=" - sys-libs/zlib - !qt5? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsingleapplication[X,qt4] - autoshutdown? ( dev-qt/qtdbus:4 ) - mpris? ( dev-qt/qtdbus:4 ) - streaming? ( - dev-qt/qtcore:4[ssl] - dev-qt/qtscript:4 - ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsingleapplication[X,qt5] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - autoshutdown? ( dev-qt/qtdbus:5 ) - mpris? ( dev-qt/qtdbus:5 ) - streaming? ( - dev-qt/qtnetwork:5[ssl] - dev-qt/qtscript:5 - ) - ) -" -DEPEND="${COMMON_DEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND="${COMMON_DEPEND} - || ( - media-video/mplayer[bidi?,libass,png,X] - ( - >=media-video/mpv-0.10.0[libass,X] - streaming? ( >=net-misc/youtube-dl-2014.11.26 ) - ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 -) - -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 - - # Turn off youtube support (which pulls in extra dependencies) if unwanted - if ! use streaming ; then - sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \ - -i src/smplayer.pro || die - sed -e 's:^#define PLAYLIST_DOWNLOAD://&:' \ - -i src/playlist.h || die - fi - - # Commented out because it gives false positives - #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts -} - -src_configure() { - cd src || die - use qt5 && eqmake5 || eqmake4 -} - -gen_translation() { - local mydir="$(qt4_get_bindir)" - if use qt5; then - mydir="$(qt5_get_bindir)" - fi - - 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 -} diff --git a/media-video/smplayer/smplayer-17.11.0.ebuild b/media-video/smplayer/smplayer-17.11.0.ebuild deleted file mode 100644 index 2611d969dfa9..000000000000 --- a/media-video/smplayer/smplayer-17.11.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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/smplayer/smplayer-17.11.2.ebuild b/media-video/smplayer/smplayer-17.11.2.ebuild index 3a43e40959a4..583903b5976e 100644 --- a/media-video/smplayer/smplayer-17.11.2.ebuild +++ b/media-video/smplayer/smplayer-17.11.2.ebuild @@ -16,7 +16,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux" IUSE="autoshutdown bidi debug mpris" COMMON_DEPEND=" -- cgit v1.2.3