| 1 |
commit: 98e05db324830a18e8abc20b1766e0966bc14300 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 20 19:54:30 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 20 19:55:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e05db3 |
| 7 |
|
| 8 |
media-libs/libde265: Drop USE=qt4,tools, unnecessary REQUIRED_USE |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/600726 |
| 11 |
Closes: https://bugs.gentoo.org/631810 |
| 12 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 13 |
|
| 14 |
media-libs/libde265/Manifest | 1 - |
| 15 |
media-libs/libde265/libde265-1.0.2.ebuild | 17 +++++++++-------- |
| 16 |
media-libs/libde265/libde265-9999.ebuild | 15 ++++++++------- |
| 17 |
media-libs/libde265/metadata.xml | 3 --- |
| 18 |
4 files changed, 17 insertions(+), 19 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest |
| 21 |
index c16d81a90d8..4dba2d1bb4b 100644 |
| 22 |
--- a/media-libs/libde265/Manifest |
| 23 |
+++ b/media-libs/libde265/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST libde265-0.9.tar.gz 258887 SHA256 226856358b1cb7aa54d3f3e1bc9bb9f062b867c6de58ab1ee94cfcb8a111cda2 SHA512 1e519cea8447bffd14dd1b78d9ab07f3e558e5f3731e26a3d5c3bd8c4a67e05c1ab228f1f82d671d64442ca78e6ead9305edd19bb17fa62c27253616ff6a84d2 WHIRLPOOL 0c0ee2cc844c2551ae1effa1305d6413a5a4a81406f1957f4d48fe74d9e1c912e424106d4c3290100b15c2d8277833cc07931fb30c4e14e827e86e785ff7f3d3 |
| 26 |
DIST libde265-1.0.2.tar.gz 381737 SHA256 c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 WHIRLPOOL 39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a |
| 27 |
|
| 28 |
diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild |
| 29 |
index 13bc0edd3cf..59318a1ef2c 100644 |
| 30 |
--- a/media-libs/libde265/libde265-1.0.2.ebuild |
| 31 |
+++ b/media-libs/libde265/libde265-1.0.2.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2016 Gentoo Foundation |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
EAPI=5 |
| 38 |
@@ -14,18 +14,19 @@ SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g |
| 39 |
LICENSE="GPL-3" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="amd64 x86" |
| 42 |
-IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools" |
| 43 |
+IUSE="debug qt5 static-libs cpu_flags_x86_sse" |
| 44 |
|
| 45 |
DEPEND=" |
| 46 |
- qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) |
| 47 |
- qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) |
| 48 |
media-libs/libsdl |
| 49 |
virtual/ffmpeg |
| 50 |
+ qt5? ( |
| 51 |
+ dev-qt/qtcore:5 |
| 52 |
+ dev-qt/qtgui:5 |
| 53 |
+ dev-qt/qtwidgets:5 |
| 54 |
+ ) |
| 55 |
" |
| 56 |
RDEPEND="${DEPEND}" |
| 57 |
|
| 58 |
-REQUIRED_USE="tools? ( || ( qt4 qt5 ) )" |
| 59 |
- |
| 60 |
src_prepare() { |
| 61 |
sed -ri 's/(PIX_FMT_)/AV_\1/g' sherlock265/VideoDecoder.cc || die |
| 62 |
autotools-multilib_src_prepare |
| 63 |
@@ -38,8 +39,8 @@ src_configure() { |
| 64 |
$(use_enable debug log-info) |
| 65 |
$(use_enable debug log-debug) |
| 66 |
$(use_enable debug log-trace) |
| 67 |
- $(use_enable tools dec265) |
| 68 |
- $(use_enable tools sherlock265) |
| 69 |
+ $(use_enable qt5 dec265) |
| 70 |
+ $(use_enable qt5 sherlock265) |
| 71 |
--disable-silent-rules |
| 72 |
--enable-log-error |
| 73 |
) |
| 74 |
|
| 75 |
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild |
| 76 |
index 157c06d8171..6fd9decdd8c 100644 |
| 77 |
--- a/media-libs/libde265/libde265-9999.ebuild |
| 78 |
+++ b/media-libs/libde265/libde265-9999.ebuild |
| 79 |
@@ -14,18 +14,19 @@ EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" |
| 80 |
LICENSE="GPL-3" |
| 81 |
SLOT="0" |
| 82 |
KEYWORDS="" |
| 83 |
-IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools" |
| 84 |
+IUSE="debug qt5 static-libs cpu_flags_x86_sse" |
| 85 |
|
| 86 |
DEPEND=" |
| 87 |
- qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) |
| 88 |
- qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) |
| 89 |
media-libs/libsdl |
| 90 |
virtual/ffmpeg |
| 91 |
+ qt5? ( |
| 92 |
+ dev-qt/qtcore:5 |
| 93 |
+ dev-qt/qtgui:5 |
| 94 |
+ dev-qt/qtwidgets:5 |
| 95 |
+ ) |
| 96 |
" |
| 97 |
RDEPEND="${DEPEND}" |
| 98 |
|
| 99 |
-REQUIRED_USE="tools? ( || ( qt4 qt5 ) )" |
| 100 |
- |
| 101 |
src_configure() { |
| 102 |
local myeconfargs=( |
| 103 |
$(use_enable cpu_flags_x86_sse sse) |
| 104 |
@@ -33,8 +34,8 @@ src_configure() { |
| 105 |
$(use_enable debug log-info) |
| 106 |
$(use_enable debug log-debug) |
| 107 |
$(use_enable debug log-trace) |
| 108 |
- $(use_enable tools dec265) |
| 109 |
- $(use_enable tools sherlock265) |
| 110 |
+ $(use_enable qt5 dec265) |
| 111 |
+ $(use_enable qt5 sherlock265) |
| 112 |
--disable-silent-rules |
| 113 |
--enable-log-error |
| 114 |
) |
| 115 |
|
| 116 |
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml |
| 117 |
index d1960a1dd91..37489247c5c 100644 |
| 118 |
--- a/media-libs/libde265/metadata.xml |
| 119 |
+++ b/media-libs/libde265/metadata.xml |
| 120 |
@@ -4,9 +4,6 @@ |
| 121 |
<maintainer type="project"> |
| 122 |
<email>media-video@g.o</email> |
| 123 |
</maintainer> |
| 124 |
- <use> |
| 125 |
- <flag name="tools">Install addtional tools, require USE=qt4 or qt5</flag> |
| 126 |
- </use> |
| 127 |
<upstream> |
| 128 |
<remote-id type="github">strukturag/libde265</remote-id> |
| 129 |
</upstream> |
Archives