| 1 |
commit: 542ec773a991348223730e7859e78f45c6b2c895 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 12 13:30:52 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 12 13:31:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ec773 |
| 7 |
|
| 8 |
media-libs/libde265: Add missing MULTILIB_USEDEP, fix USE=qt5 |
| 9 |
|
| 10 |
Qt5 is not multilib enabled, so disable if !multilib_is_native_abi |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/656772 |
| 13 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 14 |
|
| 15 |
media-libs/libde265/libde265-1.0.3.ebuild | 24 ++++++++++++++++-------- |
| 16 |
media-libs/libde265/libde265-9999.ebuild | 20 ++++++++++++++------ |
| 17 |
2 files changed, 30 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild |
| 20 |
index c9de64e6a52..90112fb2fd0 100644 |
| 21 |
--- a/media-libs/libde265/libde265-1.0.3.ebuild |
| 22 |
+++ b/media-libs/libde265/libde265-1.0.3.ebuild |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="7" |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
inherit autotools multilib-minimal |
| 31 |
|
| 32 |
@@ -13,8 +13,6 @@ if [[ ${PV} == "9999" ]] ; then |
| 33 |
else |
| 34 |
SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
- |
| 37 |
- PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch ) |
| 38 |
fi |
| 39 |
|
| 40 |
DESCRIPTION="Open h.265 video codec implementation" |
| 41 |
@@ -23,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265" |
| 42 |
LICENSE="GPL-3" |
| 43 |
SLOT="0" |
| 44 |
KEYWORDS="" |
| 45 |
-IUSE="debug qt5 static-libs cpu_flags_x86_sse" |
| 46 |
+IUSE="cpu_flags_x86_sse debug qt5 static-libs" |
| 47 |
|
| 48 |
DEPEND=" |
| 49 |
- media-libs/libsdl |
| 50 |
- virtual/ffmpeg |
| 51 |
+ media-libs/libsdl[${MULTILIB_USEDEP}] |
| 52 |
+ virtual/ffmpeg[${MULTILIB_USEDEP}] |
| 53 |
qt5? ( |
| 54 |
dev-qt/qtcore:5 |
| 55 |
dev-qt/qtgui:5 |
| 56 |
@@ -36,6 +34,8 @@ DEPEND=" |
| 57 |
" |
| 58 |
RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
+PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch ) |
| 61 |
+ |
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
|
| 65 |
@@ -52,10 +52,18 @@ multilib_src_configure() { |
| 66 |
$(use_enable debug log-info) |
| 67 |
$(use_enable debug log-debug) |
| 68 |
$(use_enable debug log-trace) |
| 69 |
- $(use_enable qt5 dec265) |
| 70 |
- $(use_enable qt5 sherlock265) |
| 71 |
--enable-log-error |
| 72 |
) |
| 73 |
+ |
| 74 |
+ if ! multilib_is_native_abi; then |
| 75 |
+ myeconfargs+=( --disable-dec265 --disable-sherlock265 ) |
| 76 |
+ else |
| 77 |
+ myeconfargs+=( |
| 78 |
+ $(use_enable qt5 dec265) |
| 79 |
+ $(use_enable qt5 sherlock265) |
| 80 |
+ ) |
| 81 |
+ fi |
| 82 |
+ |
| 83 |
econf "${myeconfargs[@]}" |
| 84 |
} |
| 85 |
|
| 86 |
|
| 87 |
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild |
| 88 |
index 271e443495b..91cbdf94843 100644 |
| 89 |
--- a/media-libs/libde265/libde265-9999.ebuild |
| 90 |
+++ b/media-libs/libde265/libde265-9999.ebuild |
| 91 |
@@ -1,7 +1,7 @@ |
| 92 |
# Copyright 1999-2018 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-EAPI="7" |
| 96 |
+EAPI=7 |
| 97 |
|
| 98 |
inherit autotools multilib-minimal |
| 99 |
|
| 100 |
@@ -21,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265" |
| 101 |
LICENSE="GPL-3" |
| 102 |
SLOT="0" |
| 103 |
KEYWORDS="" |
| 104 |
-IUSE="debug qt5 static-libs cpu_flags_x86_sse" |
| 105 |
+IUSE="cpu_flags_x86_sse debug qt5 static-libs" |
| 106 |
|
| 107 |
DEPEND=" |
| 108 |
- media-libs/libsdl |
| 109 |
- virtual/ffmpeg |
| 110 |
+ media-libs/libsdl[${MULTILIB_USEDEP}] |
| 111 |
+ virtual/ffmpeg[${MULTILIB_USEDEP}] |
| 112 |
qt5? ( |
| 113 |
dev-qt/qtcore:5 |
| 114 |
dev-qt/qtgui:5 |
| 115 |
@@ -50,10 +50,18 @@ multilib_src_configure() { |
| 116 |
$(use_enable debug log-info) |
| 117 |
$(use_enable debug log-debug) |
| 118 |
$(use_enable debug log-trace) |
| 119 |
- $(use_enable qt5 dec265) |
| 120 |
- $(use_enable qt5 sherlock265) |
| 121 |
--enable-log-error |
| 122 |
) |
| 123 |
+ |
| 124 |
+ if ! multilib_is_native_abi; then |
| 125 |
+ myeconfargs+=( --disable-dec265 --disable-sherlock265 ) |
| 126 |
+ else |
| 127 |
+ myeconfargs+=( |
| 128 |
+ $(use_enable qt5 dec265) |
| 129 |
+ $(use_enable qt5 sherlock265) |
| 130 |
+ ) |
| 131 |
+ fi |
| 132 |
+ |
| 133 |
econf "${myeconfargs[@]}" |
| 134 |
} |
Archives