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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EEEB91382C5 for ; Wed, 9 May 2018 05:55:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7717E0C33; Wed, 9 May 2018 05:55:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ACD7DE0C33 for ; Wed, 9 May 2018 05:55:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74377335C5A for ; Wed, 9 May 2018 05:55:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EDAE3A for ; Wed, 9 May 2018 05:55:52 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1525845289.fbe832b17dfaac3584e5623b61de68b37d4948f0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch media-video/mplayer/mplayer-1.3.0-r3.ebuild media-video/mplayer/mplayer-1.3.0-r5.ebuild X-VCS-Directories: media-video/mplayer/ media-video/mplayer/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fbe832b17dfaac3584e5623b61de68b37d4948f0 X-VCS-Branch: master Date: Wed, 9 May 2018 05:55:52 +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-Archives-Salt: 8553fc11-6f7c-4301-b1fb-7fe560319e60 X-Archives-Hash: db86e23ea554ff4b82304c0642b760f5 commit: fbe832b17dfaac3584e5623b61de68b37d4948f0 Author: Georgy Yakovlev sysdump net> AuthorDate: Tue May 8 14:25:46 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 9 05:54:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe832b1 media-video/mplayer: Use pkg-config to find freetype Bug: https://bugs.gentoo.org/655240 Package-Manager: Portage-2.3.36, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/8313 .../mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch | 14 ++++++++++++++ media-video/mplayer/mplayer-1.3.0-r3.ebuild | 1 + media-video/mplayer/mplayer-1.3.0-r5.ebuild | 1 + 3 files changed, 16 insertions(+) diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch new file mode 100644 index 00000000000..4bd67ca185a --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch @@ -0,0 +1,14 @@ +Index: configure +=================================================================== +--- a/configure (revision 38020) ++++ b/configure (revision 38021) +@@ -839,7 +839,8 @@ + _macosx_finder=no + _macosx_bundle=auto + _sortsub=yes +-_freetypeconfig='freetype-config' ++_freetypeconfig='pkg-config freetype2' ++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config + _fribidi=auto + _enca=auto + _inet6=auto diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild index c52e83c38b3..c48e3a8e79d 100644 --- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild @@ -242,6 +242,7 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else + epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch fi if [ ! -f VERSION ] ; then diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index 1e14de1f1ea..6b515f5212d 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -243,6 +243,7 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else + eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch fi