[xroar] Updated to new upstream release
by Andrea Musuruane
commit b3c9f85114a632140d0fd6dca27c816ea2794726
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Mon Aug 10 12:15:22 2020 +0200
Updated to new upstream release
.gitignore | 1 +
sources | 2 +-
xroar.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e33b438..b9eadf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ dragon.rom
/xroar-0.35.4.tar.gz
/xroar-0.36.tar.gz
/xroar-0.36.1.tar.gz
+/xroar-0.36.2.tar.gz
diff --git a/sources b/sources
index a1c1ee7..453ce42 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (xroar-0.36.1.tar.gz) = 7475cd46aa18aa5ed3870375fd19d951a1d47fc338d6db6ed491725f1878d4c39a50816a68aeb1a124b89a4313bf61fd16271911a1f4af77b38a55bcac7ced36
SHA512 (dragon.rom) = bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
+SHA512 (xroar-0.36.2.tar.gz) = 172f62c8b6a75426a5b0bf7c5c6ea3ed15e3bdaeb622e66c105072ddaf26e4b6849116305910ec389aff635d64dba05a056e353f19677fb1b9f019f3730df24f
diff --git a/xroar.spec b/xroar.spec
index 27d104e..bd0cc0e 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.36.1
-Release: 2%{?dist}
+Version: 0.36.2
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv3+
URL: http://www.6809.org.uk/xroar/
@@ -98,6 +98,9 @@ rm -f %{buildroot}%{_infodir}/dir
%changelog
+* Sun Aug 09 2020 Andrea Musuruane <musuruan(a)gmail.com> - 0.36.2-1
+- Updated to new upstream release
+
* Sun Jun 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.36.1-2
- pangox has been retired for F33 so disable gtkglext support
3 years, 9 months
[kodi/f31] Update to 18.8
by Michael Cronenworth
Summary of changes:
a2b8d85... Update to 18.8 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[ffmpeg] Disable LTO for i686
by Leigh Scott
commit 62cda3aa2db15f3414422d93f57744996863de32
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 9 21:24:48 2020 +0100
Disable LTO for i686
ffmpeg.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 608464e..cd73709 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -349,8 +349,7 @@ This package contains development files for %{name}
--enable-shared \\\
%{!?_without_gpl:--enable-gpl} \\\
--disable-debug \\\
- --disable-stripping \\\
- --enable-lto
+ --disable-stripping
%prep
@@ -373,6 +372,9 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
--disable-doc \
--disable-ffmpeg --disable-ffplay --disable-ffprobe \
%endif
+%ifnarch %{ix86}
+ --enable-lto \
+%endif
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
3 years, 9 months
[ffmpeg] Disable LTO for i686
by Leigh Scott
commit 2176effc9781ae4abe58bd1be02303410a96a872
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 9 21:09:29 2020 +0100
Disable LTO for i686
ffmpeg.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 742ceaf..608464e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -4,6 +4,11 @@
#global date 20200606
#global rel rc1
+%ifarch %{ix86}
+# Fails due to asm issue
+%global _lto_cflags %{nil}
+%endif
+
# rav1e has a broken .pc file
# https://bugzilla.redhat.com/show_bug.cgi?id=1811550
%if 0%{?fedora} > 32
3 years, 9 months
[compat-ffmpeg28] Enable LTO for x86_64
by Leigh Scott
commit 445e3904a7e4eafbbdd2ad053bb220c971ac97c7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 9 21:03:59 2020 +0100
Enable LTO for x86_64
compat-ffmpeg28.spec | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/compat-ffmpeg28.spec b/compat-ffmpeg28.spec
index 0df6910..2c687ba 100644
--- a/compat-ffmpeg28.spec
+++ b/compat-ffmpeg28.spec
@@ -12,7 +12,7 @@
Summary: Digital VCR and streaming server
Name: compat-ffmpeg28
Version: 2.8.17
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?!_without_amr:1}
License: GPLv3+
%else
@@ -158,14 +158,13 @@ This package contains development files for %{name}
sed -i "s|check_host_cflags -O3|check_host_cflags $RPM_OPT_FLAGS|" configure
%build
-%ifarch x86_64
-# Fails due to asm issue
-%define _lto_cflags %{nil}
-%endif
%{ff_configure}\
--shlibdir=%{_libdir} \
--disable-doc \
--disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver \
+%if 0%{?fedora} >= 33
+ --enable-lto \
+%endif
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
@@ -225,9 +224,12 @@ fi
%changelog
+* Sun Aug 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.17-3
+- Enable LTO for x86_64
+
* Sun Aug 02 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.17-2
- Rebuild for libdc1394
-- Disable LTO for x86_64
+- Disable LTO for x86_64
* Thu Jul 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.17-1
- Update to 2.8.17
3 years, 9 months
[ffmpeg] Enable LTO for x86
by Leigh Scott
commit 5515d796e0da2827658acb1686d18a0b117e5d70
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 9 18:39:22 2020 +0100
Enable LTO for x86
ffmpeg.spec | 22 ++++++---
glslang_linker_flags.patch | 12 +++++
libavfilter_glslang.cpp.patch | 14 ++++++
libavutil_x86_x86inc.asm.patch | 101 ++++++++++++++++++++++++++++++++++++++++
tests_checkasm_vf_blend.c.patch | 15 ++++++
5 files changed, 157 insertions(+), 7 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index bb3482e..742ceaf 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -97,7 +97,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3.1
-Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 6%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -106,6 +106,12 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix-vmaf-model-path.patch
+Patch1: glslang_linker_flags.patch
+# upstream glslang commit
+Patch2: libavfilter_glslang.cpp.patch
+# upstream asm commits
+Patch3: libavutil_x86_x86inc.asm.patch
+Patch4: tests_checkasm_vf_blend.c.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -192,7 +198,7 @@ BuildRequires: texinfo
%{?_with_vmaf:BuildRequires: libvmaf-devel}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
-%{!?_without_vulkan:BuildRequires: vulkan-loader-devel glslang-devel}
+%{!?_without_vulkan:BuildRequires: vulkan-loader-devel glslang-devel >= 11.0}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
%{!?_without_xvid:BuildRequires: xvidcore-devel}
@@ -239,10 +245,6 @@ VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains development files for %{name}
-%ifarch %{ix86} x86_64
-# Fails due to asm issue
-%global _lto_cflags %{nil}
-%endif
# Don't use the %%configure macro as this is not an autotool script
%global ff_configure \
./configure \\\
@@ -342,7 +344,8 @@ This package contains development files for %{name}
--enable-shared \\\
%{!?_without_gpl:--enable-gpl} \\\
--disable-debug \\\
- --disable-stripping
+ --disable-stripping \\\
+ --enable-lto
%prep
@@ -456,6 +459,11 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Aug 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-6
+- Enable LTO for x86
+- Add glslang patches and bump version for build requires
+- Add upstream patches to suppress asm warnings
+
* Mon Aug 03 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-5
- Disable LTO for x86
diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch
new file mode 100644
index 0000000..e132dd8
--- /dev/null
+++ b/glslang_linker_flags.patch
@@ -0,0 +1,12 @@
+--- a/configure
++++ b/configure
+@@ -6308,7 +6308,7 @@
+ enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
+ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lMachineIndependent -lGenericCodeGen -lpthread -lstdc++
+ enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+ require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
+ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+
diff --git a/libavfilter_glslang.cpp.patch b/libavfilter_glslang.cpp.patch
new file mode 100644
index 0000000..44028b2
--- /dev/null
+++ b/libavfilter_glslang.cpp.patch
@@ -0,0 +1,14 @@
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/6f84e92172a12f14d2...
+
+diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
+index 497df6e..125eb5c 100644
+--- a/libavfilter/glslang.cpp
++++ b/libavfilter/glslang.cpp
+@@ -24,7 +24,6 @@ extern "C" {
+ }
+
+ #include <glslang/Include/ResourceLimits.h>
+-#include <glslang/Include/revision.h>
+ #include <glslang/Public/ShaderLang.h>
+ #include <glslang/SPIRV/GlslangToSpv.h>
+
diff --git a/libavutil_x86_x86inc.asm.patch b/libavutil_x86_x86inc.asm.patch
new file mode 100644
index 0000000..5db04bf
--- /dev/null
+++ b/libavutil_x86_x86inc.asm.patch
@@ -0,0 +1,101 @@
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/3205ed31a7756ae563...
+
+diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
+index 5044ee8..01c35e3 100644
+--- a/libavutil/x86/x86inc.asm
++++ b/libavutil/x86/x86inc.asm
+@@ -411,16 +411,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
+ %endif
+ %endmacro
+
+-%macro DEFINE_ARGS_INTERNAL 3+
+- %ifnum %2
+- DEFINE_ARGS %3
+- %elif %1 == 4
+- DEFINE_ARGS %2
+- %elif %1 > 4
+- DEFINE_ARGS %2, %3
+- %endif
+-%endmacro
+-
+ %if WIN64 ; Windows x64 ;=================================================
+
+ DECLARE_REG 0, rcx
+@@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104
+ DECLARE_REG 13, R12, 112
+ DECLARE_REG 14, R13, 120
+
+-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
++%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+ %assign num_args %1
+ %assign regs_used %2
+ ASSERT regs_used >= num_args
+@@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120
+ WIN64_SPILL_XMM %3
+ %endif
+ LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+- DEFINE_ARGS_INTERNAL %0, %4, %5
++ %if %0 > 4
++ %ifnum %4
++ DEFINE_ARGS %5
++ %else
++ DEFINE_ARGS %4, %5
++ %endif
++ %elifnnum %4
++ DEFINE_ARGS %4
++ %endif
+ %endmacro
+
+ %macro WIN64_PUSH_XMM 0
+@@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56
+ DECLARE_REG 13, R12, 64
+ DECLARE_REG 14, R13, 72
+
+-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
++%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+ %assign num_args %1
+ %assign regs_used %2
+ %assign xmm_regs_used %3
+@@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72
+ PUSH_IF_USED 9, 10, 11, 12, 13, 14
+ ALLOC_STACK %4
+ LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14
+- DEFINE_ARGS_INTERNAL %0, %4, %5
++ %if %0 > 4
++ %ifnum %4
++ DEFINE_ARGS %5
++ %else
++ DEFINE_ARGS %4, %5
++ %endif
++ %elifnnum %4
++ DEFINE_ARGS %4
++ %endif
+ %endmacro
+
+ %define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required
+@@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28
+
+ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
+
+-%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
++%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+ %assign num_args %1
+ %assign regs_used %2
+ ASSERT regs_used >= num_args
+@@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
+ PUSH_IF_USED 3, 4, 5, 6
+ ALLOC_STACK %4
+ LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6
+- DEFINE_ARGS_INTERNAL %0, %4, %5
++ %if %0 > 4
++ %ifnum %4
++ DEFINE_ARGS %5
++ %else
++ DEFINE_ARGS %4, %5
++ %endif
++ %elifnnum %4
++ DEFINE_ARGS %4
++ %endif
+ %endmacro
+
+ %define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required
diff --git a/tests_checkasm_vf_blend.c.patch b/tests_checkasm_vf_blend.c.patch
new file mode 100644
index 0000000..02c4cfd
--- /dev/null
+++ b/tests_checkasm_vf_blend.c.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/320694ff84a609c5b0...
+
+diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c
+index a7578fe..bdd21d4 100644
+--- a/tests/checkasm/vf_blend.c
++++ b/tests/checkasm/vf_blend.c
+@@ -99,7 +99,7 @@ void checkasm_check_blend(void)
+
+ #define check_and_report(name, val, depth) \
+ param.mode = val; \
+- ff_blend_init(¶m, depth - 1); \
++ ff_blend_init(¶m, depth * 8); \
+ if (check_func(param.blend, #name)) \
+ check_blend_func(depth);
+
3 years, 9 months
[kodi/f32] Update to 18.8
by Michael Cronenworth
commit a2b8d85179502f08b19bce97c3d591fe459635ae
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sat Aug 8 23:39:25 2020 -0500
Update to 18.8
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index b581a0e..ed2d8ee 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=7
+MINORVERSION=8
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index 0b3b1d1..fd212fc 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -33,8 +33,8 @@
%endif
Name: kodi
-Version: 18.7
-Release: 2%{?dist}
+Version: 18.8
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -529,6 +529,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sat Aug 08 2020 Michael Cronenworth <mike(a)cchtml.com> - 18.8-1
+- Kodi 18.8 final
+
* Fri Jul 03 2020 Michael Cronenworth <mike(a)cchtml.com> - 18.7-2
- Rebuild for ffmpeg update (RFBZ#5688)
diff --git a/sources b/sources
index 812202e..7cb6743 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-18.7-patched.tar.xz) = f6929aa74000c283f7fb792eda6f851e3bdb5eeac6510da6f1d83dbdf01b1070ff5506d986afdf72716c7c6592679c8f77bcfebe3fec8aeddb61a8de8f655e55
+SHA512 (kodi-18.8-patched.tar.xz) = 3c43a8e150061ed49f89c7b810944b172cb388d07a5050659aa87b791101fd8bce285c0598c1266ec235b7a7bd45353c253c1c6a0576100449b14a7b23e4c345
SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) = 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) = b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
3 years, 9 months
[kodi] Update to Kodi 19.0 Alpha 1
by Michael Cronenworth
commit 6afb2af45ac22ca3431e5a22a21d407f818345ab
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sat Aug 8 23:26:53 2020 -0500
Update to Kodi 19.0 Alpha 1
kodi-19-httprequesthandler.patch | 20 --------------------
kodi-19-webserver.patch | 29 -----------------------------
kodi-generate-tarball-xz.sh | 10 +++++-----
kodi.spec | 32 +++++++++++++++-----------------
sources | 2 +-
5 files changed, 21 insertions(+), 72 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index b8d6585..b6098af 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,15 +1,15 @@
#!/bin/sh
MAJORVERSION=19
-MINORVERSION=0
-GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
-GITSHORT=b6daed5
+MINORVERSION=0a1
+#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
+#GITSHORT=b6daed5
CODENAME=Matrix
VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}}
-#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-$CODENAME
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-$CODENAME
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT
# download zipball
if [[ ! -f xbmc-$VERSION.zip ]]; then
diff --git a/kodi.spec b/kodi.spec
index fdebca7..923032e 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,11 +1,11 @@
# Use old cmake macro
%global __cmake_in_source_build 1
-#global PRERELEASE rc5
-#global DIRVERSION %{version}
-%global GITCOMMIT b6daed5
+%global PRERELEASE a1
+%global DIRVERSION %{version}
+#global GITCOMMIT db40b2a
# use the line below for pre-releases
-%global DIRVERSION %{version}-%{GITCOMMIT}
-#global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}-%{GITCOMMIT}
+%global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
%ifarch %{arm}
# Disable LTO for arm, see http://koji.rpmfusion.org/koji/taskinfo?taskID=424139
@@ -42,7 +42,7 @@
Name: kodi
Version: 19.0
-Release: 0.20200706gitb6daed5%{?dist}
+Release: 0.20200727gitdb40b2a%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -69,8 +69,8 @@ Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz
%endif
%if ! 0%{?_with_external_ffmpeg}
-# wget -O ffmpeg-4.3-Matrix-Alpha1.tar.gz https://github.com/xbmc/FFmpeg/archive/4.3-Matrix-Alpha1.tar.gz
-Source5: ffmpeg-4.3-Matrix-Alpha1.tar.gz
+# wget -O ffmpeg-4.3.1-Matrix-Alpha1-1.tar.gz https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Alpha1-1.tar.gz
+Source5: ffmpeg-4.3.1-Matrix-Alpha1-1.tar.gz
%endif
# Set program version parameters
@@ -85,12 +85,8 @@ Patch3: kodi-18-annobin-workaround.patch
# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
Patch4: kodi-18-brp-mangle-shebangs.patch
-# GCC/libmicrohttpd casting fix
-Patch5: kodi-19-webserver.patch
-Patch6: kodi-19-httprequesthandler.patch
-
# Python 3.9 fix
-Patch7: kodi-19-python.patch
+Patch5: kodi-19-python.patch
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -174,6 +170,7 @@ BuildRequires: libcec-devel < 4.0.0
BuildRequires: libcrystalhd-devel
%endif
BuildRequires: libcurl-devel
+BuildRequires: libdav1d-devel
BuildRequires: libdca-devel
BuildRequires: libdrm-devel
BuildRequires: libidn2-devel
@@ -370,9 +367,7 @@ This package contains the Kodi binary for X11 servers.
%patch2 -p1 -b.trousers
%patch3 -p1 -b.innobinfix
%patch4 -p1 -b.brp-mangle-shebangs
-%patch5 -p1 -b.webserver
-%patch6 -p1 -b.httprequesthandler
-%patch7 -p1 -b.python
+%patch5 -p1 -b.python
# Fix up Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
@@ -418,7 +413,7 @@ do
-DLIBDVDREAD_URL=%{SOURCE3} \
-DPYTHON_EXECUTABLE=%{__python3} \
-DCORE_PLATFORM_NAME=$BACKEND \
-%ifarch x86_64 i686
+%ifarch x86_64 i686 %{arm}
-DX11_RENDER_SYSTEM=gl \
-DWAYLAND_RENDER_SYSTEM=gl \
-DGBM_RENDER_SYSTEM=gl \
@@ -542,6 +537,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sat Aug 08 2020 Michael Cronenworth <mike(a)cchtml.com> - 19.0-0.20200727gitdb40b2a
+- Kodi 19.0 alpha 1
+
* Sun Aug 02 2020 Leigh Scott <leigh123linux(a)gmail.com> - 19.0-0.20200706gitb6daed5
- Rebuild for libfmt
diff --git a/sources b/sources
index 2957e56..1e2e1ff 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-19.0-b6daed5-patched.tar.xz) = fe16c7c90d07edb058a9eeab646ab8386a5c8c5d32ad2e78b9057464eb9d2df8976c93f6f59ba2972d0bf1ff8e1e8ad0cdb343e19314fbd174d3a13276449fbc
+SHA512 (kodi-19.0a1-patched.tar.xz) = 58554e970ddb23b5d19feb65e1c4a813f89f95337c7ec08290832fbe8bb9a14538e2b0158dcdf5e0432b2dbd3ba2d9c57906ddd7358660f795f0a3a6c1369ea3
SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) = 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) = b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
3 years, 9 months
[cannonball] Fixed FTBFS for F33 Removed desktop scriptlets
by Andrea Musuruane
commit 26823270d3c3831d0f0495899e6de73dd169fdaf
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 8 18:08:41 2020 +0200
Fixed FTBFS for F33
Removed desktop scriptlets
cannonball.spec | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/cannonball.spec b/cannonball.spec
index 40422b3..3191a74 100644
--- a/cannonball.spec
+++ b/cannonball.spec
@@ -1,6 +1,9 @@
+# force out-of-tree build for spec compatibility with older releases
+%undefine __cmake_in_source_build
+
Name: cannonball
Version: 0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: An Enhanced OutRun Engine
License: MAME
@@ -45,6 +48,9 @@ Yu Suzuki's seminal arcade racer, OutRun, on a variety of systems:
%prep
%autosetup -p1
+# Fix path in CMakeLists.txt
+sed -i 's!set(CMDIR ../cmake)!set(CMDIR ./cmake)!' cmake/CMakeLists.txt
+
# Do not link SDLmail
sed -i '/SDLmain/d' cmake/debian.cmake
@@ -54,12 +60,10 @@ sed -i 's!${lib_base}/boost_1_54_0!${lib_base}/boost!' \
%build
-mkdir build
-cd build
-%cmake ../cmake \
+%cmake ./cmake \
-DTARGET=debian \
-DCMAKE_SKIP_BUILD_RPATH=TRUE
-%make_build
+%cmake_build
%install
@@ -67,11 +71,11 @@ cd build
mkdir -p %{buildroot}%{_bindir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
mkdir -p %{buildroot}%{_libexecdir}/%{name}
-install -p -m 755 build/%{name} %{buildroot}%{_libexecdir}/%{name}
+install -p -m 755 %{_vpath_builddir}/%{name} %{buildroot}%{_libexecdir}/%{name}
# Install config
mkdir -p %{buildroot}%{_datadir}/%{name}
-install -p -m 644 build/config.xml %{buildroot}%{_datadir}/%{name}/config.xml
+install -p -m 644 %{_vpath_builddir}/config.xml %{buildroot}%{_datadir}/%{name}/config.xml
# Install Fedora README
install -p -m 644 %{SOURCE2} README.Fedora
@@ -88,21 +92,6 @@ install -p -m 644 %{SOURCE3} \
%{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%files
%{_bindir}/%{name}
%{_libexecdir}/%{name}
@@ -115,6 +104,10 @@ fi
%changelog
+* Thu Aug 06 2020 Andrea Musuruane <musuruan(a)gmail.com> - 0.3-10
+- Fixed FTBFS for F33
+- Removed desktop scriptlets
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
3 years, 9 months