Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test build - Piers #303

Closed
wants to merge 4 commits into from
Closed

Test build - Piers #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd985b7
Test build
phunkyfish Aug 10, 2024
5ddd117
Add patch for pthread create for Android NDK 26
phunkyfish Aug 14, 2024
bd0effa
Test setting CFLAGS for libzvbi using Set instead
phunkyfish Aug 14, 2024
26fff63
Disable vulkan for Android as NDK 26 doesn't have vulkan_beta.h
phunkyfish Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions depends/common/ffmpeg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 12 additions & 0 deletions depends/common/libzvbi/0011-fix-android-ndk-26.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
6 changes: 5 additions & 1 deletion depends/common/libzvbi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ cmake_minimum_required(VERSION 3.5)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})

if (CORE_SYSTEM_NAME STREQUAL android)
set(zvbi_conf "CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include -Wno-implicit-function-declaration")
else()
set(zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
endif()
list(APPEND zvbi_conf CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
list(APPEND zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
list(APPEND zvbi_conf LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib)
if (CORE_SYSTEM_NAME STREQUAL android)
list(APPEND zvbi_conf LIBS=-liconv)
Expand Down
2 changes: 1 addition & 1 deletion inputstream.ffmpegdirect/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="inputstream.ffmpegdirect"
version="22.0.0"
version="22.0.1"
name="Inputstream FFmpeg Direct"
provider-name="Ross Nicholson">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
Loading