Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
dcbab724
Commit
dcbab724
authored
Jul 31, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Sep 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: libass, only include strings.h if it's available
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
dab7df5e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
0 deletions
+49
-0
contrib/src/ass/rules.mak
contrib/src/ass/rules.mak
+1
-0
contrib/src/ass/strings.patch
contrib/src/ass/strings.patch
+48
-0
No files found.
contrib/src/ass/rules.mak
View file @
dcbab724
...
@@ -39,6 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
...
@@ -39,6 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/ass/ass-macosx.patch
$(APPLY)
$(SRC)
/ass/ass-macosx.patch
$(APPLY)
$(SRC)
/ass/ass-solaris.patch
$(APPLY)
$(SRC)
/ass/ass-solaris.patch
$(APPLY)
$(SRC)
/ass/strings.patch
$(UPDATE_AUTOCONFIG)
$(UPDATE_AUTOCONFIG)
$(MOVE)
$(MOVE)
...
...
contrib/src/ass/strings.patch
0 → 100644
View file @
dcbab724
--- 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"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment