From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 126FE158094 for ; Thu, 30 Jun 2022 13:23:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D40E09C7; Thu, 30 Jun 2022 13:23:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11DB2E09C7 for ; Thu, 30 Jun 2022 13:23:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5E4734127A for ; Thu, 30 Jun 2022 13:23:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7366C4ED for ; Thu, 30 Jun 2022 13:23:44 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1656595421.de3f3a002e26706e4dcd2d2e82ace56f17f875e1.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vdr/vdr-2.2.0-r7.ebuild X-VCS-Directories: media-video/vdr/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: de3f3a002e26706e4dcd2d2e82ace56f17f875e1 X-VCS-Branch: master Date: Thu, 30 Jun 2022 13:23:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e3f3ec90-62c4-4b46-af6d-fad2ef280c4c X-Archives-Hash: fdbc8787b4e34a66f0598faa8ccf5586 commit: de3f3a002e26706e4dcd2d2e82ace56f17f875e1 Author: Martin Dummer gmx net> AuthorDate: Thu Jun 30 12:57:44 2022 +0000 Commit: Joonas Niilola gentoo 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 gmx.net> Closes: https://github.com/gentoo/gentoo/pull/26164 Signed-off-by: Joonas Niilola 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"