Commit 6afaa28e authored by Steve Lhomme's avatar Steve Lhomme

contrib: mpg123: always apply the Android file size patch

This patch is upstreamed so it doesn't impact other platforms.
parent 909a655d
Pipeline #18706 canceled with stage
in 54 minutes and 26 seconds
From 29604faf999056eb1c5e8e934ef9ceee472c78de Mon Sep 17 00:00:00 2001 From 08d3465548263857d194947a8e17dafe62800a80 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz> From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 25 May 2020 12:46:56 +0200 Date: Mon, 25 May 2020 12:46:56 +0200
Subject: [PATCH 3/3] fix lfs_alias_t type for Android Subject: [PATCH 3/3] fix lfs_alias_t type for Android
--- ---
configure.ac | 5 +++-- configure.ac | 20 ++++++++++++++++++++
ports/cmake/src/CMakeLists.txt | 4 ++++ ports/cmake/src/CMakeLists.txt | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-) 2 files changed, 24 insertions(+)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index c494221..f22047e 100644 index c494221..4fc0e36 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1158,6 +1158,7 @@ AC_CHECK_TYPE(uint16_t, unsigned short) @@ -159,6 +159,7 @@ fi
dnl We need the windows header also for checking the module mechanism.
AC_CHECK_HEADERS([windows.h])
+android_build=no
case "$host" in
*-*-mingw*)
win32=yes
@@ -180,6 +181,21 @@ case "$host" in
AC_DEFINE( [WINDOWS_UWP], 1, [Windows UWP build] )
fi
;;
+ linux*)
+ dnl Android is linux, but a bit different
+ AC_MSG_CHECKING([for an Android system])
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ [[#ifndef __ANDROID__
+ # error Not Android
+ #endif
+ ]],[[;]])
+ ],[
+ android_build=yes
+ AC_MSG_RESULT([yes])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+ ;;
*)
win32=no
;;
@@ -1158,6 +1174,7 @@ AC_CHECK_TYPE(uint16_t, unsigned short)
AC_CHECK_SIZEOF(size_t,4) AC_CHECK_SIZEOF(size_t,4)
AC_CHECK_SIZEOF(ssize_t,4) AC_CHECK_SIZEOF(ssize_t,4)
AC_CHECK_SIZEOF(off_t,4) AC_CHECK_SIZEOF(off_t,4)
...@@ -20,17 +50,16 @@ index c494221..f22047e 100644 ...@@ -20,17 +50,16 @@ index c494221..f22047e 100644
AC_CHECK_SIZEOF(int32_t) AC_CHECK_SIZEOF(int32_t)
AC_CHECK_SIZEOF(long,4) AC_CHECK_SIZEOF(long,4)
@@ -1168,8 +1169,8 @@ if test "x$largefile_sensitive" = xyes; then @@ -1167,6 +1184,9 @@ dnl but it is actual plain off_t if the system does not have such switches.
if test "x$largefile_sensitive" = xyes; then
lfs_alias_type=long lfs_alias_type=long
lfs_alias_size=$ac_cv_sizeof_long lfs_alias_size=$ac_cv_sizeof_long
else +elif test "x$android_build" = xyes; then
- lfs_alias_type=off_t
- lfs_alias_size=$ac_cv_sizeof_off_t
+ lfs_alias_type=off64_t + lfs_alias_type=off64_t
+ lfs_alias_size=$ac_cv_sizeof_off64_t + lfs_alias_size=$ac_cv_sizeof_off64_t
fi else
lfs_alias_type=off_t
if test "x$lfs_alias_size" = "x"; then lfs_alias_size=$ac_cv_sizeof_off_t
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index 7ea2282..4b7b931 100644 index 7ea2282..4b7b931 100644
--- a/ports/cmake/src/CMakeLists.txt --- a/ports/cmake/src/CMakeLists.txt
......
...@@ -43,9 +43,7 @@ mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123 ...@@ -43,9 +43,7 @@ mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/mpg123/0001-configure-detect-WINDOWS_UWP-for-mingw-as-well.patch $(APPLY) $(SRC)/mpg123/0001-configure-detect-WINDOWS_UWP-for-mingw-as-well.patch
$(APPLY) $(SRC)/mpg123/0002-configure-don-t-error-on-GetThreadErrorMode-if-we-re.patch $(APPLY) $(SRC)/mpg123/0002-configure-don-t-error-on-GetThreadErrorMode-if-we-re.patch
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/mpg123/0003-fix-lfs_alias_t-type-for-Android.patch $(APPLY) $(SRC)/mpg123/0003-fix-lfs_alias_t-type-for-Android.patch
endif
# remove generated file from the source package # remove generated file from the source package
cd $(UNPACK_DIR) && rm -rf src/libsyn123/syn123.h cd $(UNPACK_DIR) && rm -rf src/libsyn123/syn123.h
$(APPLY) $(SRC)/mpg123/no-programs.patch $(APPLY) $(SRC)/mpg123/no-programs.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment