commit cbdf249756ff02d2a463c94f01c5e5e543281c28 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Jan 27 16:38:07 2023 +0000 reinstate the annobin fix kodi-20-annobin-workaround.patch | 14 ++++++++++++++ kodi.spec | 4 ++++ 2 files changed, 18 insertions(+) --- diff --git a/kodi-20-annobin-workaround.patch b/kodi-20-annobin-workaround.patch new file mode 100644 index 0000000..0799448 --- /dev/null +++ b/kodi-20-annobin-workaround.patch @@ -0,0 +1,14 @@ +--- a/xbmc/cores/DllLoader/exports/CMakeLists.txt 2023-01-15 09:13:34.000000000 +0000 ++++ b/xbmc/cores/DllLoader/exports/CMakeLists.txt 2023-01-27 16:32:08.489237276 +0000 +@@ -17,9 +17,9 @@ elseif(NOT CORE_SYSTEM_NAME STREQUAL win + add_library(wrapper OBJECT wrapper.c) + + if(USE_LTO) +- 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/^/${CMAKE_C_COMPILE_OPTIONS_IPO} /\" | 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/^/${CMAKE_C_COMPILE_OPTIONS_IPO} /\" | sed \"s/___wrap_/__wrap_/g\" | sed \"s/__wrap_/-Wl,-wrap,/g\" | sed \"s/.annobin//g\" | sed \"s/.text.//g\" > wrapper.def && test -s wrapper.def) + else() +- 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\" | sed \"s/.text.//g\" > wrapper.def && test -s wrapper.def) + endif() + + if(CORE_SYSTEM_NAME STREQUAL android) diff --git a/kodi.spec b/kodi.spec index 590d57e..94415fb 100644 --- a/kodi.spec +++ b/kodi.spec @@ -76,6 +76,9 @@ Patch1: kodi-20-versioning.patch # GCC 13 requires explicit definition of cstdint header Patch2: kodi-20-cstdint.patch +# Fix an annobin issue +Patch3: kodi-20-annobin-workaround.patch + %ifarch x86_64 %global _with_crystalhd 1 %endif @@ -299,6 +302,7 @@ This package contains FirewallD files for Kodi. %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -b.versioning %patch2 -p1 -b.cstdint +%patch3 -p1 -b.innobinfix # Fix up Python shebangs pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \