| 1 |
commit: fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 6 08:29:21 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 6 08:29:46 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf30344 |
| 7 |
|
| 8 |
games-engines/scummvm: Added experimental freetype_pkgconfig patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/655032 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../files/scummvm-2.0.0-freetype_pkgconfig.patch | 50 ++++++++++++++++++++++ |
| 14 |
games-engines/scummvm/scummvm-2.0.0.ebuild | 6 ++- |
| 15 |
2 files changed, 54 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..669cffc945c |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch |
| 22 |
@@ -0,0 +1,50 @@ |
| 23 |
+From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Lars Wendler <polynomial-c@g.o> |
| 25 |
+Date: Sun, 6 May 2018 10:22:48 +0200 |
| 26 |
+Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not |
| 27 |
+ available |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ configure | 17 +++++++++++------ |
| 31 |
+ 1 file changed, 11 insertions(+), 6 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/configure b/configure |
| 34 |
+index 8e2a387acc..e3c15a9a2a 100755 |
| 35 |
+--- a/configure |
| 36 |
++++ b/configure |
| 37 |
+@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then |
| 38 |
+ find_freetypeconfig |
| 39 |
+ |
| 40 |
+ if test -z "$_freetypeconfig"; then |
| 41 |
+- _freetype2=no |
| 42 |
++ if pkg-config --exists freetype2; then |
| 43 |
++ FREETYPE2_LIBS=`pkg-config --libs freetype2` |
| 44 |
++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2` |
| 45 |
++ _freetype2=yes |
| 46 |
++ else |
| 47 |
++ _freetype2=no |
| 48 |
++ fi |
| 49 |
+ else |
| 50 |
+ # Since 2.3.12, freetype-config prepends $SYSROOT to everything. |
| 51 |
+ # This means we can't pass it a --prefix that includes $SYSROOT. |
| 52 |
+@@ -4714,13 +4720,12 @@ EOF |
| 53 |
+ fi |
| 54 |
+ cc_check_clean |
| 55 |
+ fi |
| 56 |
+- |
| 57 |
+- if test "$_freetype2" = "yes"; then |
| 58 |
+- append_var LIBS "$FREETYPE2_LIBS" |
| 59 |
+- append_var INCLUDES "$FREETYPE2_CFLAGS" |
| 60 |
+- fi |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
++ if test "$_freetype2" = "yes"; then |
| 64 |
++ append_var LIBS "$FREETYPE2_LIBS" |
| 65 |
++ append_var INCLUDES "$FREETYPE2_CFLAGS" |
| 66 |
++ fi |
| 67 |
+ fi |
| 68 |
+ |
| 69 |
+ echocheck "FreeType2" |
| 70 |
+-- |
| 71 |
+2.17.0 |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild |
| 75 |
index 4f775bc1705..0df104f23aa 100644 |
| 76 |
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild |
| 77 |
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2017 Gentoo Foundation |
| 80 |
+# Copyright 1999-2018 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI=6 |
| 84 |
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND} |
| 85 |
app-arch/xz-utils |
| 86 |
x86? ( dev-lang/nasm )" |
| 87 |
|
| 88 |
-S=${WORKDIR}/${P/_/} |
| 89 |
+S="${WORKDIR}/${P/_/}" |
| 90 |
+ |
| 91 |
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" ) |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
default |
Archives