[vlc-commits] Contribs: fix compilation for Android

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 17 15:25:36 2014 +0200| [edf522679b48acaa7bba99eda5ebd26e26186311] | committer: Jean-Baptiste Kempf

Contribs: fix compilation for Android

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit f2ade2268d923cb2d9e686fb1981b6a5abb596af)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=edf522679b48acaa7bba99eda5ebd26e26186311
---

 contrib/src/gpg-error/gpgerror-android.patch |   14 ++++++++++++++
 contrib/src/gpg-error/rules.mak              |    1 +
 2 files changed, 15 insertions(+)

diff --git a/contrib/src/gpg-error/gpgerror-android.patch b/contrib/src/gpg-error/gpgerror-android.patch
new file mode 100644
index 0000000..3b7b43d
--- /dev/null
+++ b/contrib/src/gpg-error/gpgerror-android.patch
@@ -0,0 +1,14 @@
+--- libgpg-error/src/gpgrt-int.h.orig	2014-09-17 15:23:22.992333706 +0200
++++ libgpg-error/src/gpgrt-int.h	2014-09-17 15:23:52.772783925 +0200
+@@ -105,9 +105,9 @@
+ 
+ int _gpgrt_fflush (gpgrt_stream_t stream);
+ int _gpgrt_fseek (gpgrt_stream_t stream, long int offset, int whence);
+-int _gpgrt_fseeko (gpgrt_stream_t stream, off_t offset, int whence);
++int _gpgrt_fseeko (gpgrt_stream_t stream, gpgrt_off_t offset, int whence);
+ long int _gpgrt_ftell (gpgrt_stream_t stream);
+-off_t _gpgrt_ftello (gpgrt_stream_t stream);
++gpgrt_off_t _gpgrt_ftello (gpgrt_stream_t stream);
+ void _gpgrt_rewind (gpgrt_stream_t stream);
+ 
+ int _gpgrt_fgetc (gpgrt_stream_t stream);
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 7fc0958..7fb6bdd 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -13,6 +13,7 @@ ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/gpg-error/windres-make.patch
 endif
 	$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
+	$(APPLY) $(SRC)/gpg-error/gpgerror-android.patch
 	$(MOVE)
 	cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
 ifdef HAVE_IOS