contrib: Prefix EXTRA_LDFLAGS with the path to our build dir
[vlc.git] / contrib / src / zvbi / zvbi-android.patch
bloba33e9e5e2be87ea270e4b613328901403fe43208
1 --- zvbi/src/conv.c 2013-08-28 14:10:16.000000000 +0200
2 +++ zvbi-new/src/conv.c 2014-12-09 11:14:36.948231282 +0100
3 @@ -26,7 +26,9 @@
4 #endif
6 #include <errno.h>
7 -#include <langinfo.h>
8 +#ifdef HAVE_LANGINFO_H
9 +# include <langinfo.h>
10 +#endif
12 #include "misc.h"
13 #include "conv.h"
14 @@ -1234,9 +1236,12 @@
15 const char *dst_format;
17 dst_format = bind_textdomain_codeset (vbi_intl_domainname, NULL);
19 +#ifdef HAVE_LANGINFO_H
20 if (NULL == dst_format)
21 dst_format = nl_langinfo (CODESET);
22 +#else
23 + dst_format = "UTF-8";
24 +#endif
26 return dst_format; /* may be NULL */
28 --- zvbi/src/Makefile.am 2013-07-10 11:14:47.000000000 +0200
29 +++ zvbi-new/src/Makefile.am 2014-12-10 22:09:27.410157237 +0100
30 @@ -94,7 +94,6 @@
31 page_table.c page_table.h \
32 pdc.c pdc.h \
33 pfc_demux.c pfc_demux.h \
34 - proxy-client.c proxy-client.h \
35 raw_decoder.c raw_decoder.h \
36 sampling_par.c sampling_par.h \
37 search.c search.h ure.c ure.h \