commit: de3f3a002e26706e4dcd2d2e82ace56f17f875e1 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Thu Jun 30 12:57:44 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jun 30 13:23:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3f3a00
media-video/vdr: fix compile with USE=vanilla on 2.2.0-r7 fix error in patch logic with gcc-11 replace deprecated virtual/jpeg Closes: https://bugs.gentoo.org/855269 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/26164 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-video/vdr/vdr-2.2.0-r7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild index 63fed2e99446..ea4fd71aae83 100644 --- a/media-video/vdr/vdr-2.2.0-r7.ebuild +++ b/media-video/vdr/vdr-2.2.0-r7.ebuild @@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" COMMON_DEPEND=" - virtual/jpeg:* + media-libs/libjpeg-turbo sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" @@ -212,9 +212,9 @@ src_prepare() { eend $? "make depend failed" eapply "${FILESDIR}/${P}_gcc7extpng.patch" - eapply "${FILESDIR}/${P}_gcc11.patch" fi + eapply "${FILESDIR}/${P}_gcc11.patch" eapply "${FILESDIR}/${P}_gentoo.patch" eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch"