Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
Date: Wed, 14 Feb 2018 19:55:42
Message-Id: 1518638106.c1f407f158f5a7f55eab45cb6e05ee89e78cf5d7.mgorny@gentoo
1 commit: c1f407f158f5a7f55eab45cb6e05ee89e78cf5d7
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 13 21:20:07 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 19:55:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f407f1
7
8 media-video/mpv: sync 9999 with latest release
9
10 Closes: https://github.com/gentoo/gentoo/pull/7175
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 media-video/mpv/mpv-9999.ebuild | 11 +++++------
14 1 file changed, 5 insertions(+), 6 deletions(-)
15
16 diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
17 index 1543eb4db2e..c530dace68b 100644
18 --- a/media-video/mpv/mpv-9999.ebuild
19 +++ b/media-video/mpv/mpv-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)'
27
28 WAF_PV=1.9.8
29
30 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
31 +inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
32
33 DESCRIPTION="Media player based on MPlayer and mplayer2"
34 HOMEPAGE="https://mpv.io/"
35 @@ -147,10 +147,9 @@ src_prepare() {
36 src_configure() {
37 tc-export CC PKG_CONFIG AR
38
39 - if tc-is-cross-compiler && use raspberry-pi; then
40 - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
41 - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
42 - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
43 + if use raspberry-pi; then
44 + append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
45 + append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
46 fi
47
48 local mywafargs=(