summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin28408 -> 28397 bytes
-rw-r--r--media-video/aegisub/Manifest3
-rw-r--r--media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild4
-rw-r--r--media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch59
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild8
-rw-r--r--media-video/gnome-mplayer/Manifest4
-rw-r--r--media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild77
-rw-r--r--media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild (renamed from media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild)8
-rw-r--r--media-video/libav/Manifest2
-rw-r--r--media-video/libav/libav-12.2.ebuild4
-rw-r--r--media-video/mplayer/Manifest4
-rw-r--r--media-video/mplayer/mplayer-1.3.0-r5.ebuild2
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild22
-rw-r--r--media-video/smplayer/Manifest6
-rw-r--r--media-video/smplayer/smplayer-18.3.0.ebuild134
-rw-r--r--media-video/smplayer/smplayer-18.9.0.ebuild (renamed from media-video/smplayer/smplayer-18.5.0.ebuild)0
-rw-r--r--media-video/subtitlecomposer/Manifest2
-rw-r--r--media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild75
19 files changed, 162 insertions, 254 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f656fad3f8ad..a6fc46699466 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index cf3922ad578a..904196781387 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,8 +1,9 @@
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 BLAKE2B 6bff0828e0678e269dc129be03f9bf1135933abefdb9190de5fe6afd214b9caa8b4283f65f30853b3ae118c5ade021a174fa164cee606b635f6587deabf47581 SHA512 802ee218e2c005760a8260271791df0891ef6392bec4fbbb5936df5a84db888b0b6f36055d0760c4929cb442adcc1433a363fa93eae6c163f296166028684daf
DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3477 BLAKE2B 371dc9d92c3f07dde0c4adb5d8964a1d8e8200daeb0bb097cb04d4f31356109d5760222612be40ded76494df3ff2476b7ed765e83de32e12192a879cf5092238 SHA512 a3ffee8d55f0f9608ce8e64eacc3560b38f0cd899f443ede1c2bf3fa39bcffdad87e15529654312e3c58ddf5074f118f4e6d15f5f925961bfd4f4d6c4fedea43
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3526 BLAKE2B a38d02662aa047b7f9d505391a25be856d50267c9d917a9df7342b1afaec5122f22a4649d0ac8adfb2259eb0c01bbab1681c138280db191782711d4bd32436ef SHA512 b657555a4f49c09b9c06570dd9927a136b1341ef8ae5cd209ec73ce45a62e33fcd15fbf90b8a870f6a68f071b3e322e03fcd17f8fdfc04b1579a64b19bfea0cb
EBUILD aegisub-9999.ebuild 3041 BLAKE2B 4c9adee1e3a308b1e7470d6badc8f9af87f68a7ca09d589328a591634f4286123d972c2a8a61859881cdedebcb73dd81a22c74fa5410caac102a2327cf7684b0 SHA512 d2231b788ff67fd79db1c8a353cd87d5e9959f496b80b88cd7ec89f380756b3defe3f0c69a703828b00d63020276fbe749618a555912724c65077914bafe0a9d
MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
index 34d509212bae..d5b623eb234e 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -59,6 +59,8 @@ PATCHES=(
"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+ "${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
+
)
aegisub_check_compiler() {
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch
new file mode 100644
index 000000000000..47508951e452
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch
@@ -0,0 +1,59 @@
+From d4461f65be5aa440506bd23e90e71aaf8f0ebada Mon Sep 17 00:00:00 2001
+From: sidneys <sidneys.github.io@outlook.com>
+Date: Sat, 31 Mar 2018 02:57:19 +0200
+Subject: [PATCH] fix(updated-macos-build): prefix icu method calls
+ (icu::BreakIterator, icu::Locale, icu::UnicodeString)
+
+---
+ libaegisub/common/character_count.cpp | 6 +++---
+ src/utils.cpp | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libaegisub/common/character_count.cpp b/libaegisub/common/character_count.cpp
+index 0b8c70b31..1276f74fb 100644
+--- a/libaegisub/common/character_count.cpp
++++ b/libaegisub/common/character_count.cpp
+@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
+ static std::once_flag token;
+ std::call_once(token, [&] {
+ UErrorCode status = U_ZERO_ERROR;
+- bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
++ bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
+ if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
+ });
+
+@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
+
+ size_t count = 0;
+ auto pos = character_bi.first();
+- for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
++ for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
+ if (!mask)
+ ++count;
+ else {
+@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
+ auto& bi = get_break_iterator(&str[0], str.size());
+
+ for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
+- if (end == BreakIterator::DONE)
++ if (end == icu::BreakIterator::DONE)
+ return str.size();
+ if (n == 0)
+ return pos;
+diff --git a/src/utils.cpp b/src/utils.cpp
+index 876c4c011..2416aa7a2 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
+ }
+
+ wxString LocalizedLanguageName(wxString const& lang) {
+- Locale iculoc(lang.c_str());
++ icu::Locale iculoc(lang.c_str());
+ if (!iculoc.isBogus()) {
+- UnicodeString ustr;
++ icu::UnicodeString ustr;
+ iculoc.getDisplayName(iculoc, ustr);
+ #ifdef _MSC_VER
+ return wxString(ustr.getBuffer());
+
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 966dd1090955..2bd8d7a99abe 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,5 +17,5 @@ EBUILD ffmpeg-3.3.6.ebuild 15946 BLAKE2B f7c4901c2d50228f6ded80b2523f4b7bb98cc80
EBUILD ffmpeg-3.3.8.ebuild 15952 BLAKE2B cb001262d47db1677277959baf4c3f272bdfa1be98a205be42599c2d00c9de0e405c3cc916d0bb4b035af4551c95af854a4c8418772d4e2916d7f1bf16fda3a4 SHA512 f8c2924c5eddccfe626edbf62f15fac0c7e700a8a0c5b25ef95a03d2434365cbc2c40fbfd089a639dc4897212f7346579d9940fc9a51dc6b06f2b1e25cb064c1
EBUILD ffmpeg-3.4.4.ebuild 15622 BLAKE2B 7daf35a4c6d2ae51a03c9b2c7b7866de02cb6c730387b7725d47994a64807995ebe86fde4673f15d703a09998f4412bac6f3edaaa1bccd297102a1cdd6f50119 SHA512 b5210dda0b6593d2f3317bc6919fa6b91b809e34f4e0f951cfdd0290450837bf77bc89cdc291c9047d77d02d1a13eaabbca6c9d4fd601672379d994e0a5a0664
EBUILD ffmpeg-4.0.2.ebuild 16472 BLAKE2B fe2c7dc060bad7b5eba2037089b8d3df8e62ce4d4bbf1adeafdc11587e1af4997b16bd79be88eec956ba198a2b739cc0c7dfb881c7cc3d8e61380f416b2b27e1 SHA512 a0bb187d96f6c00b51962a500f91ba1017f6205030971cd968159d0b910314c72e0b259822c6d3fdacdc73d053557322c9551f2da1868f526faebecbbe9aa1fa
-EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 7dc905745eba08b462799f06fe60d911b1337c017af55378b8ae2c57678fe9b80d94d644a31d30deee2caab1b4e3fdd276c71feafccd0a2b6902f6479e0bebec SHA512 d41c2c98523862b479102ee45a28edb36607c2a8504c644c5dc8894e374c7985e619b91d130b062e4b47ca33bdf770b4c6b220878a6c75eebb656f377baae7e3
+EBUILD ffmpeg-9999.ebuild 16485 BLAKE2B 327840f56de6b23f32c887f8898c69369082486676ed368a66ebeac9e844f4fba4a0201e61cfa0be36a4693e605ae8c4ad500c38e054395225a99a8fb30dea41 SHA512 cd6fee7e89c5f7e29b2837f9f44a12ca3d0aa145f5e3d966242f5bdda3bdae224e010b7d37179dd78765e61dbd0e908f878c7d8d5190985ffdcfbd2c15d37141
MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 464a797c81b0..a6f55da8a28e 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -24,13 +24,13 @@ fi
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
+HOMEPAGE="https://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
SRC_URI="mirror://gentoo/${P}.tar.bz2"
else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+ SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
fi
FFMPEG_REVISION="${PV#*_p}"
@@ -74,7 +74,7 @@ FFMPEG_FLAG_MAP=(
libv4l:libv4l2 pulseaudio:libpulse libdrm
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
- jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+ jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
@@ -168,7 +168,6 @@ RDEPEND="
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
- celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
encode? (
@@ -404,6 +403,7 @@ multilib_src_configure() {
--enable-avfilter
--enable-avresample
--disable-stripping
+ --disable-libcelt # bug #664158
"${myconf[@]}"
)
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index b78d5b3557ec..8ed35f8e0e1f 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-mplayer-1.0.8.tar.gz 1062691 BLAKE2B 0ff843b26ffdaffa7240c04a55f15f8534e657610f6483da9fa92d054e748187a288deb8e330032ae0d2e774d3e4d7b913680669ccf0b8fa9202c98fee686295 SHA512 795530313a6b8135e328e0cb8f5d9081b0b5caf8f81b1ab182a2876241bd662b96d2ef25164dc6f436fb66168472f3716e033697f0aeffe5f84c59cd8de420c2
DIST gnome-mplayer-1.0.9.tar.gz 1082199 BLAKE2B c2219b5a6902c9e2c9849dd3a31a29e2270b7ca513945a5e9684fa429073f42e360f6ef698f42b93e61a3d39edef1215f657e92cfab1c9fe3b19d5ea85eac839 SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d
-EBUILD gnome-mplayer-1.0.8.ebuild 1806 BLAKE2B 307dc849ae9e5c42fad05e46ac988aaa350cadb3ec0bf6a0b580e4e0d8a8bbfbe519907cd37523d6a1651ddab2a4c808821ac4e78f4c3488d075b310349dc8df SHA512 90b98fdb269d35030cd565e579e60c1249c7e7ff120421b4d2a85b32cea932843a097d4dfa2dfb6363ba99e1dd9964a352eff1544a0cf0525acfc19bfe762b93
-EBUILD gnome-mplayer-1.0.9.ebuild 1920 BLAKE2B 3c779d5faa4e322df4f1d98226de4ff4063797b983c691c8880e0745178bdbf20e20ca52c7b706890459d4dd0758ad52cefb660dd05e8b97c075871988b03d0e SHA512 fc42f38928001d4f844afdfebbd66ff2ad9a258fd9c6e92cfea0c20424536ab8e2cb60885f787a3ce0284d4d5bbe66394e994546ea3a11743e503c13b801fa6d
+EBUILD gnome-mplayer-1.0.9-r1.ebuild 1831 BLAKE2B bdf0def0efec4fbc85a5894dfebb021368f2cf697b074e942a2754530eb7e17529967c7622d3969f92ecf3bfabec58f144747c265a17fbcc1564e3caf7c2dd1c SHA512 57766faefaa347e2a660a4efdb4168ac3f04aaf88096dece82f7690181f86628a887a9e42cfee5794ed68dcea189dbdb42d1db551e931e7e41a60ed51da5d614
MISC metadata.xml 398 BLAKE2B e6cef861c1aa0178c3ff271532dc97bef997513cf5f5c37ab4a41dfe0e3430d5b2f7fdfcf0f7952a5ff6811a96520139531d23b8a446b226e21f57d6df739a4f SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
deleted file mode 100644
index e3cfb34a9eb0..000000000000
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ interface to MPlayer"
-HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
- >=media-libs/gmtk-${PV}[dconf=]
- >=x11-libs/gtk+-3.2:3
- x11-libs/libX11
- x11-libs/libXScrnSaver
- alsa? ( media-libs/alsa-lib )
- dbus? ( >=dev-libs/dbus-glib-0.100 )
- gda? ( gnome-extra/libgda:5 )
- gnome? ( gnome-base/nautilus )
- ipod? ( >=media-libs/libgpod-0.7 )
- libnotify? ( >=x11-libs/libnotify-0.7 )
- musicbrainz? (
- media-libs/musicbrainz:3
- net-misc/curl
- )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
-RDEPEND="${COMMON_DEPEND}
- x11-themes/gnome-icon-theme-symbolic
- >=media-video/mplayer-1.0_rc4_p20100101[libass]"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*.txt"
-
-src_configure() {
- econf \
- --enable-gtk3 \
- $(use_enable gnome nautilus) \
- --with-gio \
- $(use_with dbus) \
- $(use_with gda libgda) \
- $(use_with alsa) \
- $(use_with pulseaudio) \
- $(use_with libnotify) \
- $(use_with ipod libgpod) \
- $(use_with musicbrainz libmusicbrainz3)
-}
-
-src_install() {
- default
- rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
index b6473af07344..bd9fa8ca7f6d 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
+IUSE="alsa +dbus +dconf gda gnome ipod libnotify pulseaudio"
COMMON_DEPEND=">=dev-libs/glib-2.30
>=media-libs/gmtk-${PV}[dconf=]
@@ -24,10 +24,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.30
gnome? ( gnome-base/nautilus )
ipod? ( >=media-libs/libgpod-0.7 )
libnotify? ( >=x11-libs/libnotify-0.7 )
- musicbrainz? (
- media-libs/musicbrainz:3
- net-misc/curl
- )
pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
RDEPEND="${COMMON_DEPEND}
x11-themes/gnome-icon-theme-symbolic
@@ -51,7 +47,7 @@ src_configure() {
$(use_with pulseaudio) \
$(use_with libnotify) \
$(use_with ipod libgpod) \
- $(use_with musicbrainz libmusicbrainz3)
+ --without-libmusicbrainz3
}
src_install() {
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index a7f12614c4aa..eed40f26f6b0 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -10,7 +10,7 @@ DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c16
DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
-EBUILD libav-12.2.ebuild 11369 BLAKE2B e9a42c458e83c67aaf24a75d19eaef75d5e46a5ab86731cbf8c7ef0fb56deba7f225aa1247b87ef52632d8ae216ae42cd9a2701303682ffe1317ff7744e50b53 SHA512 07276111122185e4b0997024a0a1709c1cd93766a3f3ef30d118ccb5fd95281c45d6009a4fa48ec62d24404d99a8b90d1e0e2ca0abd1049b68fe2b4b3054ae4a
+EBUILD libav-12.2.ebuild 11368 BLAKE2B 466d137e1af49b2a85d63c07d69fec072866ce6794c151828886ce5b362a9c033fa2704a1232f80f760e919b3d99e6aa559aa7549511f9ba9ab87b65bdb6bbf4 SHA512 39711c1372fa9526968e2c5c7f4031a2e98f0f612b5fa2bc4b726a4e6bbcfc260a01bc7aba6137b225bfc84b428437789a24a9440f5e68e72c05b98a0d53f978
EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 855312ca1307..4a74879aae80 100644
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -30,9 +30,7 @@ fi
LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7faa780127e5..9aca096dd73a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -8,6 +8,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r5.ebuild 17297 BLAKE2B 5cf6ff6c9d48f91e837c4fd3e2d6bda6486e85ef01427943bd2c12fd7a68264ca5c0ad52c48624b72e0b73721c649a95804e2569ddb98555d8dfe5cdf74597ea SHA512 42b9866eecfb3eb44fecdb08dfdeac0a8ae878cb3c4757f5fe7b2f97bc7e60fbf8451ccef81bac7ec49c24072260dfd43d8a661e52a5c9edc15f5e75ef37ea3f
-EBUILD mplayer-9999.ebuild 16983 BLAKE2B 22736905b595451ca6ecbb09ca28a32e59655de960850764e22a228caceb515a05b4dca2af04af1d63c1a1b3e78709c69c69b35f28e79c15aa9149e1344b3e36 SHA512 a8625386b91ee53d09dc50ae5a34938f9e981e174748399d580329308fbca99afdf71340214f4a7d577f5c4c61dd7ba1a6edef11d62f40bf3430eb3d365889a5
+EBUILD mplayer-1.3.0-r5.ebuild 17239 BLAKE2B 14610d37c97c6ef7e1a7fd25a10814fdc8f5228e22dfb72fe7ff187be109df22726d971b8055573998f5195980147e11c825b0b9523565547e7f697f086bdbf3 SHA512 3e465467b575b01809513618f5a87d94673041e2408466e59af852c971bcaf1adfff15c703bd9b756b6bbd86351a3b1afcc186681d47c1e7c092a4aedcb6da6b
+EBUILD mplayer-9999.ebuild 16826 BLAKE2B 241abb8f0f5f14dcfef74ee2d4ea246bf41192748142539d8d91bb587d9452717c4994964b6d618efb1067523a3a8b3f55589cda86e425331a205ae508c1200d SHA512 dc8bce1f333b2ed5e1f791fb44db4572c046994b6076be7e68aa1d1ce729d84c9c3c7d3b89ca66ba2ec972ef4bc54a4dd9f8f6baca8f47ccab1e99368732d487
MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 6b515f5212dc..bd0a05495e9c 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -152,8 +152,6 @@ SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 252dcec7163c..c93bd3174815 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=6
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
@@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
"
ASM_DEP="dev-lang/yasm"
@@ -152,8 +151,6 @@ SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS=""
fi
# faac codecs are nonfree
@@ -162,7 +159,6 @@ fi
# ass and freetype font require iconv and ass requires freetype fonts
# unicode transformations are usefull only with iconv
# radio requires oss or alsa backend
-# xvmc requires xvideo support
REQUIRED_USE="
dga? ( X )
dvdnav? ( dvd )
@@ -176,8 +172,7 @@ REQUIRED_USE="
vidix? ( X )
xinerama? ( X )
xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
+ xv? ( X )"
RESTRICT="faac? ( bindist )"
pkg_setup() {
@@ -213,7 +208,7 @@ src_unpack() {
subversion_src_unpack
cd "${WORKDIR}"
rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
else
unpack ${A}
fi
@@ -279,9 +274,11 @@ src_configure() {
--disable-svga --disable-svgalib_helper
--disable-ass-internal
--disable-arts
+ --disable-directfb
--disable-kai
--disable-libopus
--disable-libilbc
+ --disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
"
@@ -489,11 +486,6 @@ src_configure() {
use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
use xscreensaver || myconf+=" --disable-xss"
use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
############################
# OSX (aqua) configuration #
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 45d9817b9e06..51bf174806d6 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,10 +3,8 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
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.5.0.tar.bz2 5040367 BLAKE2B 18b1db622f11cb8c9a5f088071fae8b3d7deb43ff05b8d84c96a9e9717c03fd5e29fbec0f101ca2088c627838501bc83f5746b1290ad6110b5c35255c1293bd0 SHA512 0e5dfa0d4ef435156d93d3231deff9cea695adac1e6364db8af7f6c0bd6918062de8cd5fcacd8057d181644d2ad7b9dfd2c8241402e479ad6bf3c4db970bb1ba
DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
-EBUILD smplayer-18.3.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4
-EBUILD smplayer-18.5.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e
+DIST smplayer-18.9.0.tar.bz2 5163115 BLAKE2B 84fa716fbe01dc3719ca74e0419229c70e0955ccbc482471e24dfa22e8ce4c03edbd99bc8aa92cad2ec2fc2060feaf2cab13850fab05fc6f3e34bba63861e22a SHA512 ee2e68877ad9fb45923e46512953326b6703e830964c3d123aee6a4ca96990fae03a3b568b313aae76548dea08d671f86ef55b3023bc46eb3aa73b1ff96c135d
EBUILD smplayer-18.6.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4
+EBUILD smplayer-18.9.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e
MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.3.0.ebuild b/media-video/smplayer/smplayer-18.3.0.ebuild
deleted file mode 100644
index 711f309f6bec..000000000000
--- a/media-video/smplayer/smplayer-18.3.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/smplayer/smplayer-18.5.0.ebuild b/media-video/smplayer/smplayer-18.9.0.ebuild
index 8b62e36f20f2..8b62e36f20f2 100644
--- a/media-video/smplayer/smplayer-18.5.0.ebuild
+++ b/media-video/smplayer/smplayer-18.9.0.ebuild
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index cc420b0bc654..8245e434af4f 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,3 +1,5 @@
DIST subtitlecomposer-0.6.4.tar.gz 1638176 BLAKE2B b71de34df7f9e98d94a541d029bf5a06aafd6c67ded1b87647c176f0579b3f6e6fe79c797e9f438d850f9aad93cc461704ea43590b31ed855673249f6227f4d0 SHA512 585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
+DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748 SHA512 0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a
EBUILD subtitlecomposer-0.6.4.ebuild 1637 BLAKE2B 81ccde2b2548926de9af7c5b037a004450ec489496a22d4dbbc76c34ac93da04a857047a10b0d3e31b26a1cddc7dc7b601084b5b4a1eac056b4c9754609f9dbe SHA512 e85d6ee1a174bb5156349091358affc4690002c6da7e7b89a1db707ed3317ec786af9999a927d29451684eb705e04c9997299dbaef07f2ec41ec4a76634703e4
+EBUILD subtitlecomposer-0.6.6.ebuild 1839 BLAKE2B 699491b8b9883f2dbce6b26c697df671fcd8501e007f1150da504119446f277b8b6b2a60cbdab0de430fe0a700787b4a354969e0627f0af90f2bf9f228d7a99e SHA512 01571831ae2448ad7570c52948e8a0e8b3eaf61d8f2ef9f8d397ef026a3d077ee40c4448d62f66f55aba08102f780c946f658a6e6e5c98a5887739372e8ab0cb
MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
new file mode 100644
index 000000000000..57cb8983dbf1
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Text-based subtitles editor"
+HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
+SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer libav mpv unicode xine"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ media-libs/phonon[qt5(+)]
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ mpv? ( media-video/mpv )
+ unicode? ( dev-libs/icu:= )
+ xine? (
+ media-libs/xine-lib
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !media-video/subtitlecomposer:4
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
+ $(cmake-utils_use_find_package gstreamer GStreamer)
+ $(cmake-utils_use_find_package mpv MPV)
+ $(cmake-utils_use_find_package unicode ICU)
+ $(cmake-utils_use_find_package xine Xine)
+ $(cmake-utils_use_find_package xine X11)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ elog "Some example scripts provided by ${PN} require dev-lang/ruby"
+ elog "or dev-lang/python to be installed."
+}