From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1032584-garchives=archives.gentoo.org@lists.gentoo.org>
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 630A7138334
for <garchives@archives.gentoo.org>; Mon, 25 Jun 2018 14:44:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 463F9E09DF;
Mon, 25 Jun 2018 14:44:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 1C4F1E09DF
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jun 2018 14:44:08 +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 6C725335C7E
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jun 2018 14:44:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A0F5E2B3
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jun 2018 14:44:05 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
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" <polynomial-c@gentoo.org>
Message-ID: <1529937827.0ebdd558a60577558cf0aafb312b777204a1085b.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/, media-tv/mythtv/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-tv/mythtv/files/mythtv-29.2-freetype_pkgconfig.patch media-tv/mythtv/mythtv-0.28.1-r4.ebuild
X-VCS-Directories: media-tv/mythtv/files/ media-tv/mythtv/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 0ebdd558a60577558cf0aafb312b777204a1085b
X-VCS-Branch: master
Date: Mon, 25 Jun 2018 14:44:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 4b8ea438-e786-4554-b835-9e3595aec5f1
X-Archives-Hash: c2e24d1dc2dbe0967b5f7388bb146191
commit: 0ebdd558a60577558cf0aafb312b777204a1085b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 14:43:47 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 14:43:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebdd558
media-tv/mythtv: Replaced freetype-config with pkg-config
Bug: https://bugs.gentoo.org/658534
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/mythtv-29.2-freetype_pkgconfig.patch | 28 ++++++++++++++++++++++
media-tv/mythtv/mythtv-0.28.1-r4.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/media-tv/mythtv/files/mythtv-29.2-freetype_pkgconfig.patch b/media-tv/mythtv/files/mythtv-29.2-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..fa248907f27
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-29.2-freetype_pkgconfig.patch
@@ -0,0 +1,28 @@
+From 8cbb51a829ca4602da75c359bc598130c19264c4 Mon Sep 17 00:00:00 2001
+From: Peter Bennett <pbennett@mythtv.org>
+Date: Wed, 9 May 2018 19:17:12 -0400
+Subject: [PATCH] configure: new version of freetype2 does not support
+ freetype-config
+
+freetype2 v2.9.1 uses only pkgconfig and removes support for freetype-config
+
+Fixes #13262
+---
+ mythtv/configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mythtv/configure b/mythtv/configure
+index 8b55291685b..a378fc44dde 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -7406,8 +7406,8 @@ if enabled darwin_da; then
+ fi
+
+ if enabled freetype2; then
+- echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $TMPMAK
+- echo "FREETYPE_LIBS=`freetype-config --libs`" >> $TMPMAK
++ echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2)" >> $TMPMAK
++ echo "FREETYPE_LIBS=$($pkg_config --libs $pkg_config_flags freetype2)" >> $TMPMAK
+ fi
+
+ if test $target_os = darwin; then
diff --git a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
index 50c45fc9e8b..9faa120b8df 100644
--- a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
@@ -175,6 +175,7 @@ src_prepare() {
echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
eapply "${FILESDIR}/${P}-glibc225.patch"
+ eapply -p2 "${FILESDIR}/${PN}-29.2-freetype_pkgconfig.patch" #658534
}
src_configure() {