Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/
Date: Thu, 30 Jun 2022 13:23:48
Message-Id: 1656595421.de3f3a002e26706e4dcd2d2e82ace56f17f875e1.juippis@gentoo
1 commit: de3f3a002e26706e4dcd2d2e82ace56f17f875e1
2 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
3 AuthorDate: Thu Jun 30 12:57:44 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 13:23:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3f3a00
7
8 media-video/vdr: fix compile with USE=vanilla on 2.2.0-r7
9
10 fix error in patch logic with gcc-11
11 replace deprecated virtual/jpeg
12
13 Closes: https://bugs.gentoo.org/855269
14 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
15 Closes: https://github.com/gentoo/gentoo/pull/26164
16 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
17
18 media-video/vdr/vdr-2.2.0-r7.ebuild | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
22 index 63fed2e99446..ea4fd71aae83 100644
23 --- a/media-video/vdr/vdr-2.2.0-r7.ebuild
24 +++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
25 @@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
26 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
27
28 COMMON_DEPEND="
29 - virtual/jpeg:*
30 + media-libs/libjpeg-turbo
31 sys-libs/libcap
32 >=media-libs/fontconfig-2.4.2
33 >=media-libs/freetype-2"
34 @@ -212,9 +212,9 @@ src_prepare() {
35 eend $? "make depend failed"
36
37 eapply "${FILESDIR}/${P}_gcc7extpng.patch"
38 - eapply "${FILESDIR}/${P}_gcc11.patch"
39 fi
40
41 + eapply "${FILESDIR}/${P}_gcc11.patch"
42 eapply "${FILESDIR}/${P}_gentoo.patch"
43 eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
44 eapply "${FILESDIR}/${P}_glibc-2.24.patch"