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 5838A138334 for ; Sun, 8 Jul 2018 06:26:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6589FE09B6; Sun, 8 Jul 2018 06:26:03 +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 F324DE09B6 for ; Sun, 8 Jul 2018 06:26:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 57DBB335C7E for ; Sun, 8 Jul 2018 06:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7715435A for ; Sun, 8 Jul 2018 06:25:58 +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: <1531031147.e5dd966c420938f1cf5c3533fdf9ac75c98b3e64.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/graphlcd-base/files/, app-misc/graphlcd-base/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild X-VCS-Directories: app-misc/graphlcd-base/files/ app-misc/graphlcd-base/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e5dd966c420938f1cf5c3533fdf9ac75c98b3e64 X-VCS-Branch: master Date: Sun, 8 Jul 2018 06:25:58 +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: ee8c568e-96f7-448b-ac85-609fd127e80f X-Archives-Hash: 31e5ff53a3b24343c0091165c9c48c40 commit: e5dd966c420938f1cf5c3533fdf9ac75c98b3e64 Author: Lars Wendler gentoo org> AuthorDate: Sun Jul 8 06:25:47 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jul 8 06:25:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dd966c app-misc/graphlcd-base: Use pkg-config instead of freetype-config. Closes: https://bugs.gentoo.org/654902 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../graphlcd-base-0.1.9-freetype_pkgconfig.patch | 30 ++++++++++++++++++++++ app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild | 20 ++++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch new file mode 100644 index 00000000000..cbdaf1ceb59 --- /dev/null +++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch @@ -0,0 +1,30 @@ +--- graphlcd-base-0.1.9/glcdgraphics/Makefile ++++ graphlcd-base-0.1.9/glcdgraphics/Makefile +@@ -33,9 +33,9 @@ + -include $(DEPFILE) + + ifdef HAVE_FREETYPE2 +- ifneq ($(shell which freetype-config),) +- INCLUDES += $(shell freetype-config --cflags) +- LIBS += $(shell freetype-config --libs) ++ ifneq ($(shell which pkg-config),) ++ INCLUDES += $(shell pkg-config --cflags freetype2) ++ LIBS += $(shell pkg-config --libs freetype2) + else + INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype + LIBS += -lfreetype +--- graphlcd-base-0.1.9/tools/genfont/Makefile ++++ graphlcd-base-0.1.9/tools/genfont/Makefile +@@ -9,10 +9,10 @@ + OBJS = genfont.o + + INCLUDES += -I../../ +-INCLUDES += `freetype-config --cflags` ++INCLUDES += `pkg-config --cflags freetype2` + + LIBDIRS += -L../../glcdgraphics/ +-LIBS += `freetype-config --libs` ++LIBS += `pkg-config --libs freetype2` + + all: $(PRGNAME) + .PHONY: all diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild index 8a568403957..7c3f216d977 100644 --- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild +++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,20 +16,26 @@ SLOT="0" LICENSE="GPL-2" IUSE="g15" -DEPEND="media-libs/freetype" -RDEPEND="g15? ( app-misc/g15daemon ) - media-libs/freetype" +CDEPEND="media-libs/freetype" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + g15? ( app-misc/g15daemon )" + +PATCHES=( + "${FILESDIR}/${PN}-0.1.5-nostrip.patch" + "${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch" +) src_prepare() { sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:" - eapply "${FILESDIR}/${PN}-0.1.5-nostrip.patch" + + default sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:" #gcc-6 fix sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:" - - default } src_install() {