commit 2a7aafee33e77485a06796c0ca3f722673617b05 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Sat Jun 29 09:22:03 2019 -0500 Update to 18.3 ...workaround.patch => kodi-18-annobin-workaround.patch | 2 +- kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 17 ++++++++++++----- sources | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) --- diff --git a/kodi-18-annobin-aarch64-workaround.patch b/kodi-18-annobin-workaround.patch similarity index 89% rename from kodi-18-annobin-aarch64-workaround.patch rename to kodi-18-annobin-workaround.patch index 857e21b..6007052 100644 --- a/kodi-18-annobin-aarch64-workaround.patch +++ b/kodi-18-annobin-workaround.patch @@ -7,7 +7,7 @@ index efcd872..5d0a847 100644 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) ++ 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) 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-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 6c6546d..bd63e6b 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=18 -MINORVERSION=2 +MINORVERSION=3 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 CODENAME=Leia diff --git a/kodi.spec b/kodi.spec index e7923bf..0b16173 100644 --- a/kodi.spec +++ b/kodi.spec @@ -16,7 +16,11 @@ %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) %global _with_libbluray 1 +%if 0%{?fedora} < 31 %global _with_cwiid 1 +%else +%global _with_cwiid 0 +%endif %global _with_libssh 1 %global _with_libcec 1 %global _with_external_ffmpeg 1 @@ -29,8 +33,8 @@ %endif Name: kodi -Version: 18.2 -Release: 4%{?dist} +Version: 18.3 +Release: 1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -67,8 +71,8 @@ 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 +# Fix an annobin issue +Patch3: kodi-18-annobin-workaround.patch %ifarch x86_64 i686 %global _with_crystalhd 1 @@ -339,7 +343,7 @@ This package contains the Kodi binary for X11 servers. %patch1 -p1 -b.versioning %patch2 -p1 -b.trousers -%ifarch aarch64 +%if 0%{?fedora} > 29 %patch3 -p1 -b.innobinfix %endif @@ -491,6 +495,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %changelog +* Sat Jun 29 2019 Michael Cronenworth <mike(a)cchtml.com&gt; - 18.3-1 +- Kodi 18.3 final + * Wed May 08 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 18.2-4 - Bump release for koji failed task diff --git a/sources b/sources index dd08620..7b4fe23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1989e4130266ed0a2da6805460894005 kodi-18.2-patched.tar.xz +668da70cd2e8a8ede4f44e49cb3709b7 kodi-18.3-patched.tar.xz 2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz