[vlc-commits] Contribs: fix zvbi compilation for Android
Jean-Baptiste Kempf
git at videolan.org
Wed Dec 10 22:14:12 CET 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 10 22:13:45 2014 +0100| [be0c8c647577b61574bd212c5afb1d7992e89236] | committer: Jean-Baptiste Kempf
Contribs: fix zvbi compilation for Android
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be0c8c647577b61574bd212c5afb1d7992e89236
---
contrib/src/zvbi/rules.mak | 8 +++++---
contrib/src/zvbi/zvbi-android.patch | 37 +++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index 5c866a8..aac57f4 100644
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -23,6 +23,9 @@ endif
ifdef HAVE_DARWIN_OS
$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
endif
+ifdef HAVE_ANDROID
+ $(APPLY) $(SRC)/zvbi/zvbi-android.patch
+endif
$(MOVE)
DEPS_zvbi = pthreads iconv $(DEPS_iconv)
@@ -33,6 +36,7 @@ ZVBICONF := \
--disable-nls --disable-proxy \
--without-doxygen \
$(HOSTCONF)
+
ifdef HAVE_MACOSX
ZVBI_CFLAGS += -fnested-functions
endif
@@ -41,10 +45,8 @@ ZVBI_CFLAGS += -DPTW32_STATIC_LIB
endif
.zvbi: zvbi
- $(UPDATE_AUTOCONFIG)
-ifdef HAVE_WIN32
+ $(UPDATE_AUTOCONFIG)
$(RECONF)
-endif
cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)" ./configure $(ZVBICONF)
cd $</src && $(MAKE) install
cd $< && $(MAKE) SUBDIRS=. install
diff --git a/contrib/src/zvbi/zvbi-android.patch b/contrib/src/zvbi/zvbi-android.patch
new file mode 100644
index 0000000..a33e9e5
--- /dev/null
+++ b/contrib/src/zvbi/zvbi-android.patch
@@ -0,0 +1,37 @@
+--- zvbi/src/conv.c 2013-08-28 14:10:16.000000000 +0200
++++ zvbi-new/src/conv.c 2014-12-09 11:14:36.948231282 +0100
+@@ -26,7 +26,9 @@
+ #endif
+
+ #include <errno.h>
+-#include <langinfo.h>
++#ifdef HAVE_LANGINFO_H
++# include <langinfo.h>
++#endif
+
+ #include "misc.h"
+ #include "conv.h"
+@@ -1234,9 +1236,12 @@
+ const char *dst_format;
+
+ dst_format = bind_textdomain_codeset (vbi_intl_domainname, NULL);
+-
++#ifdef HAVE_LANGINFO_H
+ if (NULL == dst_format)
+ dst_format = nl_langinfo (CODESET);
++#else
++ dst_format = "UTF-8";
++#endif
+
+ return dst_format; /* may be NULL */
+ }
+--- zvbi/src/Makefile.am 2013-07-10 11:14:47.000000000 +0200
++++ zvbi-new/src/Makefile.am 2014-12-10 22:09:27.410157237 +0100
+@@ -94,7 +94,6 @@
+ page_table.c page_table.h \
+ pdc.c pdc.h \
+ pfc_demux.c pfc_demux.h \
+- proxy-client.c proxy-client.h \
+ raw_decoder.c raw_decoder.h \
+ sampling_par.c sampling_par.h \
+ search.c search.h ure.c ure.h \
More information about the vlc-commits
mailing list