Package: renpy
Version: 6.15.7-1
Severity: serious
Tags: upstream patch
Justification: fails to build from source (but built successfully in the past)
Dear Maintainer,
I recently submitted a tiny patch to fix a libavresample problem (#732333).
While testing the changes, I discovered that a build script bug was preventing
the package from being built properly. Upstream already released a fix for
that, but it's not included in any Ren'Py release yet. I propose adding it to
debian/patches so the package builds correctly on testing/unstable and the next
stable.
It will still be required if packages are made for Ren'Py 6.16.*. After 6.17,
it should not be necessary any more.
The upstream patch can also be found on github:
https://github.com/renpy/renpy/commit/608a55b
-- System Information:
Debian Release: jessie/sid
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.11-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages renpy depends on:
ii python 2.7.5-5
ii python-pygame 1.9.1release+dfsg-8
ii python-renpy 6.15.7-1
ii python-support 1.0.15
ii ttf-dejavu-core 2.33+svn2514-3
Versions of packages renpy recommends:
ii python [python-ctypes] 2.7.5-5
renpy suggests no packages.
diff --git a/module/setup.py b/module/setup.py
index 12f5eac..9d92184 100755
--- a/module/setup.py
+++ b/module/setup.py
@@ -25,7 +25,7 @@ include("zlib.h")
include("png.h")
include("SDL.h", directory="SDL")
include("ft2build.h")
-include("freetype/freetype.h", directory="freetype2")
+include("freetype/freetype.h", directory="freetype2", optional=True) or include("freetype.h", directory="freetype2")
include("libavutil/avstring.h")
include("libavformat/avformat.h")
include("libavcodec/avcodec.h")
diff --git a/module/ttgsubtable.h b/module/ttgsubtable.h
index 6a49a95..fcbefb8 100644
--- a/module/ttgsubtable.h
+++ b/module/ttgsubtable.h
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <ft2build.h>
-#include <freetype/ftotval.h>
+#include FT_OPENTYPE_VALIDATE_H
typedef struct
{
@@ -101,7 +101,7 @@ typedef struct
typedef struct
{
int LookupCount;
- TLookup *Lookup;
+ TLookup *Lookup;
} TLookupList;
typedef struct
