commit 02c83c7c8aaf0d819bbacc38e6aa8354f456ddf6 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Feb 26 17:08:05 2019 +0100 Apply patch by Gaël Stephan to fix kodi on aarch64 - rhbz#5171 kodi-18-annobin-aarch64-workaround.patch | 13 +++++++++++++ kodi.spec | 8 ++++++++ 2 files changed, 21 insertions(+) --- diff --git a/kodi-18-annobin-aarch64-workaround.patch b/kodi-18-annobin-aarch64-workaround.patch new file mode 100644 index 0000000..857e21b --- /dev/null +++ b/kodi-18-annobin-aarch64-workaround.patch @@ -0,0 +1,13 @@ +diff --git a/xbmc/cores/DllLoader/exports/CMakeLists.txt b/xbmc/cores/DllLoader/exports/CMakeLists.txt +index efcd872..5d0a847 100644 +--- a/xbmc/cores/DllLoader/exports/CMakeLists.txt ++++ b/xbmc/cores/DllLoader/exports/CMakeLists.txt +@@ -16,7 +16,7 @@ elseif(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL w + add_options(C ALL_BUILDS "-fPIC") + add_library(wrapper OBJECT wrapper.c) + +- add_custom_target(wrapper.def ALL ${CMAKE_NM} ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/wrapper.dir/wrapper.c.o | grep __wrap | awk '{ printf(\"%s \", \$\$3) }' | sed \"s/___wrap_/__wrap_/g\" | sed \"s/__wrap_/-Wl,-wrap,/g\" > wrapper.def && test -s wrapper.def) ++ add_custom_target(wrapper.def ALL ${CMAKE_NM} ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/wrapper.dir/wrapper.c.o | grep __wrap | awk '{ printf(\"%s \", \$\$3) }' | sed \"s/___wrap_/__wrap_/g\" | sed \"s/__wrap_/-Wl,-wrap,/g\" | sed \"s/.annobin//g\" > wrapper.def && test -s wrapper.def) + + if(CORE_SYSTEM_NAME STREQUAL android) + add_custom_command(TARGET wrapper.def COMMAND echo \"-L${DEPENDS_PATH}/lib/dummy-lib${APP_NAME_LC} -l${APP_NAME_LC}\" >> wrapper.def) diff --git a/kodi.spec b/kodi.spec index 7f66c83..bc963ac 100644 --- a/kodi.spec +++ b/kodi.spec @@ -67,6 +67,9 @@ Patch1: kodi-18.0-versioning.patch # Prevent trousers from being linked, which breaks Samba Patch2: kodi-18-trousers.patch +# Fix an annobin issue happening only on aarch64 +Patch3: kodi-18-annobin-aarch64-workaround.patch + %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -335,6 +338,11 @@ This package contains the Kodi binary for X11 servers. %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -b.versioning %patch2 -p1 -b.trousers + +%ifarch aarch64 +%patch3 -p1 -b.innobinfix +%endif + # Fix up Python shebangs pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \ tools/EventClients/lib/python/zeroconf.py \