From 1a1a842c66608ef9f1f5355322b12254556087b2 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Wed, 14 Aug 2024 08:34:42 +0100 Subject: [PATCH 1/3] Disable vulkan in ffmpeg for Android as NDK 26 doesn't have vulkan_beta.h --- depends/common/ffmpeg/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/depends/common/ffmpeg/CMakeLists.txt b/depends/common/ffmpeg/CMakeLists.txt index 66d757ce..cfc834a5 100644 --- a/depends/common/ffmpeg/CMakeLists.txt +++ b/depends/common/ffmpeg/CMakeLists.txt @@ -45,6 +45,11 @@ else() list(APPEND EXTRA_CONF --enable-debug) endif() +# Android NDK 26 doesn't come with vulkan_beta.h so let's disable it in that case +if (CORE_SYSTEM_NAME STREQUAL android) + list(APPEND EXTRA_CONF --disable-vulkan) +endif() + # Run the builds include(ExternalProject) if(NOT WIN32) From f6f3c9c83f9863f6e3c5b9d402b1a045af23b347 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Wed, 14 Aug 2024 08:55:01 +0100 Subject: [PATCH 2/3] Add patch for pthread create and compile option for Android NDK 26 compatibility with libzvbi --- depends/common/libzvbi/0011-fix-android-ndk-26.patch | 12 ++++++++++++ depends/common/libzvbi/CMakeLists.txt | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 depends/common/libzvbi/0011-fix-android-ndk-26.patch diff --git a/depends/common/libzvbi/0011-fix-android-ndk-26.patch b/depends/common/libzvbi/0011-fix-android-ndk-26.patch new file mode 100644 index 00000000..20f7954e --- /dev/null +++ b/depends/common/libzvbi/0011-fix-android-ndk-26.patch @@ -0,0 +1,12 @@ +diff --color -aur a/configure.ac b/configure.ac +--- a/configure.ac 2023-08-25 16:50:40 ++++ b/configure.ac 2024-08-13 11:48:38 +@@ -248,7 +248,7 @@ + dnl When upgrading to autoconf 2.71, AC_TRY_LINK deprecated and replaced + dnl with AC_LINK_IFELSE. + dnl +-AC_CHECK_LIB(pthread, pthread_create,,[ ++AC_SEARCH_LIBS([pthread_create], [pthread pthreads],,[ + AC_CHECK_LIB(pthreadGC2, pthread_create,,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[pthread_create();]])],[],[ + # same as previous, but use '-pthread' instead of '-lpthread' diff --git a/depends/common/libzvbi/CMakeLists.txt b/depends/common/libzvbi/CMakeLists.txt index aaf846c7..f91ce7d6 100644 --- a/depends/common/libzvbi/CMakeLists.txt +++ b/depends/common/libzvbi/CMakeLists.txt @@ -5,7 +5,12 @@ cmake_minimum_required(VERSION 3.5) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) list(APPEND zvbi_conf CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/include) -list(APPEND zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include) +if (CORE_SYSTEM_NAME STREQUAL android) + set(zvbi_cflags "CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include -Wno-implicit-function-declaration") + list(APPEND zvbi_conf ${zvbi_cflags}) +else() + list(APPEND zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include) +endif() list(APPEND zvbi_conf LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib) if (CORE_SYSTEM_NAME STREQUAL android) list(APPEND zvbi_conf LIBS=-liconv) From 2d69d6ff48f21ae589cb703bd4618f5e4f53c2a3 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Sat, 10 Aug 2024 16:20:48 +0100 Subject: [PATCH 3/3] changelog and version 22.0.1 --- inputstream.ffmpegdirect/addon.xml.in | 2 +- inputstream.ffmpegdirect/changelog.txt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in index a94fff3e..438989ef 100644 --- a/inputstream.ffmpegdirect/addon.xml.in +++ b/inputstream.ffmpegdirect/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt index c655e52e..ad04d73a 100644 --- a/inputstream.ffmpegdirect/changelog.txt +++ b/inputstream.ffmpegdirect/changelog.txt @@ -1,3 +1,10 @@ +v22.0.1 +- Add patch for pthread create and compile option for Android NDK 26 compatibility with libzvbi +- Disable vulkan in ffmpeg for Android as NDK 26 doesn't have vulkan_beta.h + +v22.0.0 +- Initial Release + v21.3.5 - Update depednencies to fix building on apple silicon (gnutls 3.8.4) and binutils on linux (2.41 or higher)