Control: tags -1 patch
On Tue, Jun 05, 2018 at 12:28:18PM +0100, James Cowgill wrote:
> Control: reopen -1
>
> Hi,
>
> On 04/06/18 23:09, Debian Bug Tracking System wrote:
> > Package: scorched3d
> > Followup-For: Bug #892434
> >
> >
> > Given the dependency on pkg-config and work in the changelog, I believe
> > this is a false positive for scorched3d. Not exactly sure how to test,
> > but if it FTBFS, then it can be dealt with then.
>
> The build log states that it used freetype-config to detect freetype:
> > checking for freetype-config... /usr/bin/freetype-config
> > checking for FreeType -- version >= 7.0.1... yes
>
> The code for this is in acinclude.m4 which has no mentions of pkg-config
> in it.
Fix is attached.
> James
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
Description: Use pkg-config instead of freetype-config
Author: Adrian Bunk
Bug-Debian: https://bugs.debian.org/892434
--- scorched3d-44+dfsg.orig/configure.ac
+++ scorched3d-44+dfsg/configure.ac
@@ -40,7 +40,7 @@ m4_include([configure-gl.m4])
m4_include([configure-al.m4])
m4_include([configure-wx.m4])
m4_include([configure-ogg.m4])
-m4_include([configure-ft.m4])
+PKG_CHECK_MODULES(FT2, freetype2)
m4_include([configure-fftw.m4])
S3D_SUBDIRS="launcher client server"
else
