[vlc-commits] Contribs: fix mpg123 for Android

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec  2 14:32:28 2015 +0100| [2f19e4f4ed4ddd8dbafa76a191233ebc0d0c061e] | committer: Jean-Baptiste Kempf

Contribs: fix mpg123 for Android

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

 contrib/src/mpg123/mpg123_android_off_t.patch |   21 +++++++++++++++++++++
 contrib/src/mpg123/rules.mak                  |    3 +++
 2 files changed, 24 insertions(+)

diff --git a/contrib/src/mpg123/mpg123_android_off_t.patch b/contrib/src/mpg123/mpg123_android_off_t.patch
new file mode 100644
index 0000000..ce022bb
--- /dev/null
+++ b/contrib/src/mpg123/mpg123_android_off_t.patch
@@ -0,0 +1,21 @@
+--- mpg123/configure.ac	2015-08-12 07:38:31.000000000 +0200
++++ mpg123.old/configure.ac	2015-12-02 14:26:55.303304758 +0100
+@@ -1007,6 +1007,7 @@
+ AC_CHECK_SIZEOF(size_t,4)
+ AC_CHECK_SIZEOF(ssize_t,4)
+ AC_CHECK_SIZEOF(off_t,4)
++AC_CHECK_SIZEOF(off64_t,8)
+ AC_CHECK_SIZEOF(int32_t)
+ AC_CHECK_SIZEOF(long,4)
+ 
+@@ -1017,8 +1018,8 @@
+   lfs_alias_type=long
+   lfs_alias_size=$ac_cv_sizeof_long
+ else
+-  lfs_alias_type=off_t
+-  lfs_alias_size=$ac_cv_sizeof_off_t
++  lfs_alias_type=off64_t
++  lfs_alias_size=$ac_cv_sizeof_off64_t
+ fi
+ 
+ if test "x$lfs_alias_size" = "x"; then 
diff --git a/contrib/src/mpg123/rules.mak b/contrib/src/mpg123/rules.mak
index db6a057..1f90f79 100644
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@@ -15,6 +15,9 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
 mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
 	$(UNPACK)
 	$(APPLY) $(SRC)/mpg123/no-programs.patch
+ifdef HAVE_ANDROID
+	$(APPLY) $(SRC)/mpg123/mpg123_android_off_t.patch
+endif
 	$(MOVE)
 
 .mpg123: mpg123