Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/tuxpuck/, games-arcade/tuxpuck/files/
Date: Mon, 07 May 2018 08:25:17
Message-Id: 1525681490.dd0204b722226cc131f7ed94ccd8470cfc7709c6.polynomial-c@gentoo
1 commit: dd0204b722226cc131f7ed94ccd8470cfc7709c6
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 7 08:24:50 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon May 7 08:24:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0204b7
7
8 games-arcade/tuxpuck: Use pkg-config to find freetype
9
10 Closes: https://bugs.gentoo.org/654894
11 Package-Manager: Portage-2.3.36, Repoman-2.3.9
12
13 .../tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch | 11 +++++++++++
14 games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild | 4 +++-
15 2 files changed, 14 insertions(+), 1 deletion(-)
16
17 diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
18 new file mode 100644
19 index 00000000000..410024e48dc
20 --- /dev/null
21 +++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
22 @@ -0,0 +1,11 @@
23 +--- tuxpuck-0.8.2/utils/Makefile
24 ++++ tuxpuck-0.8.2/utils/Makefile
25 +@@ -6,7 +6,7 @@
26 + all : ttf2font data2c anim
27 +
28 + ttf2font : ttf2font.c
29 +- $(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
30 ++ $(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
31 +
32 + data2c : data2c.c
33 + $(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
34
35 diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
36 index b1df215d59d..092a4932727 100644
37 --- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
38 +++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
39 @@ -21,6 +21,7 @@ RDEPEND="
40 "
41 DEPEND="${RDEPEND}
42 media-libs/freetype:2
43 + virtual/pkgconfig
44 "
45
46 src_prepare() {
47 @@ -40,7 +41,8 @@ src_prepare() {
48
49 eapply "${FILESDIR}"/${P}-ldflags.patch \
50 "${FILESDIR}"/${P}-png15.patch \
51 - "${FILESDIR}"/${P}-parallel.patch
52 + "${FILESDIR}"/${P}-parallel.patch \
53 + "${FILESDIR}"/${P}-freetype_pkgconfig.patch
54 }
55
56 src_compile() {