From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
Date: Sun, 6 May 2018 08:29:52 +0000 (UTC) [thread overview]
Message-ID: <1525595386.fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc.polynomial-c@gentoo> (raw)
commit: fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 08:29:21 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun May 6 08:29:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf30344
games-engines/scummvm: Added experimental freetype_pkgconfig patch
Bug: https://bugs.gentoo.org/655032
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/scummvm-2.0.0-freetype_pkgconfig.patch | 50 ++++++++++++++++++++++
games-engines/scummvm/scummvm-2.0.0.ebuild | 6 ++-
2 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..669cffc945c
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,50 @@
+From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 6 May 2018 10:22:48 +0200
+Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
+ available
+
+---
+ configure | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 8e2a387acc..e3c15a9a2a 100755
+--- a/configure
++++ b/configure
+@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
+ find_freetypeconfig
+
+ if test -z "$_freetypeconfig"; then
+- _freetype2=no
++ if pkg-config --exists freetype2; then
++ FREETYPE2_LIBS=`pkg-config --libs freetype2`
++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
++ _freetype2=yes
++ else
++ _freetype2=no
++ fi
+ else
+ # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+ # This means we can't pass it a --prefix that includes $SYSROOT.
+@@ -4714,13 +4720,12 @@ EOF
+ fi
+ cc_check_clean
+ fi
+-
+- if test "$_freetype2" = "yes"; then
+- append_var LIBS "$FREETYPE2_LIBS"
+- append_var INCLUDES "$FREETYPE2_CFLAGS"
+- fi
+ fi
+
++ if test "$_freetype2" = "yes"; then
++ append_var LIBS "$FREETYPE2_LIBS"
++ append_var INCLUDES "$FREETYPE2_CFLAGS"
++ fi
+ fi
+
+ echocheck "FreeType2"
+--
+2.17.0
+
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
index 4f775bc1705..0df104f23aa 100644
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0.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
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
app-arch/xz-utils
x86? ( dev-lang/nasm )"
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
src_prepare() {
default
next reply other threads:[~2018-05-06 8:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-06 8:29 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-07 7:03 [gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/ Lars Wendler
2019-11-05 7:09 Lars Wendler
2019-12-30 22:38 James Le Cuirot
2020-09-24 6:13 Lars Wendler
2024-09-23 11:24 Sam James
2025-05-10 7:41 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1525595386.fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox