vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jul 31 16:54:52 2015 +0200| [dcbab724b614ed20a42ce4c9b8a49b715552d309] | committer: Jean-Baptiste Kempf
contribs: libass, only include strings.h if it's available Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcbab724b614ed20a42ce4c9b8a49b715552d309 --- contrib/src/ass/rules.mak | 1 + contrib/src/ass/strings.patch | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak index 966c9fd..d2f9cdc 100644 --- a/contrib/src/ass/rules.mak +++ b/contrib/src/ass/rules.mak @@ -39,6 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass $(UNPACK) $(APPLY) $(SRC)/ass/ass-macosx.patch $(APPLY) $(SRC)/ass/ass-solaris.patch + $(APPLY) $(SRC)/ass/strings.patch $(UPDATE_AUTOCONFIG) $(MOVE) diff --git a/contrib/src/ass/strings.patch b/contrib/src/ass/strings.patch new file mode 100644 index 0000000..7e028b2 --- /dev/null +++ b/contrib/src/ass/strings.patch @@ -0,0 +1,48 @@ +--- libass/libass/ass.c.orig 2015-07-10 18:30:35.165007300 +0200 ++++ libass/libass/ass.c 2015-07-10 18:35:00.583091000 +0200 +@@ -21,7 +21,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_STRINGS_H + #include <strings.h> ++#endif + #include <assert.h> + #include <errno.h> + #include <sys/types.h> +--- libass/libass/ass_font.c.orig 2015-07-10 18:30:37.924973400 +0200 ++++ libass/libass/ass_font.c 2015-07-10 18:35:03.696308800 +0200 +@@ -25,7 +25,9 @@ + #include FT_GLYPH_H + #include FT_TRUETYPE_TABLES_H + #include FT_OUTLINE_H ++#ifdef HAVE_STRINGS_H + #include <strings.h> ++#endif + #include <limits.h> + + #include "ass.h" +--- libass/libass/ass_fontconfig.c.orig 2015-07-10 18:30:40.017464100 +0200 ++++ libass/libass/ass_fontconfig.c 2015-07-10 18:35:06.568353600 +0200 +@@ -22,7 +22,9 @@ + #include <stdio.h> + #include <assert.h> + #include <string.h> ++#ifdef HAVE_STRINGS_H + #include <strings.h> ++#endif + #include <sys/types.h> + #include <sys/stat.h> + #include <inttypes.h> +--- libass/libass/ass_utils.c.orig 2015-07-10 18:30:41.897803700 +0200 ++++ libass/libass/ass_utils.c 2015-07-10 18:35:09.705589800 +0200 +@@ -23,7 +23,9 @@ + #include <stdio.h> + #include <stdint.h> + #include <inttypes.h> ++#ifdef HAVE_STRINGS_H + #include <strings.h> ++#endif + #include <limits.h> + + #include "ass_library.h" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
