[libquicktime] Mass rebuild for x264
by Sérgio M. Basto
commit e5add975167aea80b9f66c8477101319499d516e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 7 03:57:57 2020 +0100
Mass rebuild for x264
libquicktime.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libquicktime.spec b/libquicktime.spec
index 9e9e7d8..87f3a50 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -7,7 +7,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
-Release: 43%{?rel_string}%{?dist}
+Release: 44%{?rel_string}%{?dist}
License: LGPLv2+
URL: http://libquicktime.sourceforge.net/
Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libq...
@@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
%changelog
+* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 1.2.4-44.112.20180804gitfff99cd
+- Mass rebuild for x264
+
* Thu Mar 12 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.4-43.112.20180804gitfff99cd
- Rebuilt for i686
3 years, 10 months
[kodi] Update ffmpeg source, remove python2 references, add new binary
by Michael Cronenworth
commit bd1edabd60be87b75000ee6a88206b28decc4745
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Jul 6 23:08:23 2020 -0500
Update ffmpeg source, remove python2 references, add new binary
kodi.spec | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index ef56cff..8416df8 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -62,8 +62,8 @@ Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz
%endif
%if ! 0%{?_with_external_ffmpeg}
-# wget -O ffmpeg-4.0.4-Leia-18.4.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz
-Source5: ffmpeg-4.0.4-Leia-18.4.tar.gz
+# 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
%endif
# Set program version parameters
@@ -212,13 +212,8 @@ BuildRequires: ninja-build
BuildRequires: pcre-devel
BuildRequires: pixman-devel
BuildRequires: pulseaudio-libs-devel
-%if 0%{?fedora} > 31
BuildRequires: python3-devel
BuildRequires: python3-pillow
-%else
-BuildRequires: python2-devel
-BuildRequires: python2-pillow
-%endif
BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
BuildRequires: spdlog-devel
@@ -282,11 +277,7 @@ Requires: xorg-x11-utils
# This is just symlinked to, but needed both at build-time
# and for installation
-%if 0%{?fedora} > 31
Requires: python3-pillow%{?_isa}
-%else
-Requires: python2-pillow%{?_isa}
-%endif
%description common
Common Kodi files and binaries
@@ -372,11 +363,7 @@ This package contains the Kodi binary for X11 servers.
%patch7 -p1 -b.python
# Fix up Python shebangs
-%if 0%{?fedora} > 31
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
-%else
-pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
-%endif
tools/EventClients/lib/python/zeroconf.py \
tools/EventClients/Clients/PS3BDRemote/ps3_remote.py \
tools/EventClients/lib/python/ps3/sixaxis.py \
@@ -414,11 +401,7 @@ do
-DLIRC_DEVICE=/var/run/lirc/lircd \
-DLIBDVDNAV_URL=%{SOURCE2} \
-DLIBDVDREAD_URL=%{SOURCE3} \
-%if 0%{?fedora} > 31
-DPYTHON_EXECUTABLE=%{__python3} \
-%else
- -DPYTHON_EXECUTABLE=%{__python2} \
-%endif
-DCORE_PLATFORM_NAME=$BACKEND \
%ifarch x86_64 i686
-DX11_RENDER_SYSTEM=gl \
@@ -456,13 +439,8 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop
# Normally we are expected to build these manually. But since we are using
# the system Python interpreter, we also want to use the system libraries
install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
-%if 0%{?fedora} > 31
ln -s %{python3_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
-%else
-ln -s %{python2_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
-%endif
#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
-#ln -s %{python2_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
# Use external font files instead of bundled ones
ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/
@@ -489,6 +467,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%doc README.md docs
%{_bindir}/kodi
%{_bindir}/kodi-standalone
+%{_bindir}/JsonSchemaBuilder
%{_bindir}/TexturePacker
%dir %{_libdir}/kodi/
%{_libdir}/kodi/addons/
@@ -508,11 +487,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%files eventclients
%license LICENSE.md LICENSES/
-%if 0%{?fedora} > 31
%{python3_sitelib}/kodi
-%else
-%{python2_sitelib}/kodi
-%endif
%dir %{_datadir}/pixmaps/kodi
%{_datadir}/pixmaps/kodi/*.png
%{_bindir}/kodi-ps3remote
3 years, 10 months
[ffmpeg] Mass rebuild for x264
by Sérgio M. Basto
commit 3e640e6d6c554443f47418e934732b1d984c59ca
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 7 03:57:40 2020 +0100
Mass rebuild for x264
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b35a48f..587cdc2 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
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -448,6 +448,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 4.3-4
+- Mass rebuild for x264
+
* Wed Jul 01 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-3
- Rebuilt
3 years, 10 months
[gstreamer1-plugins-ugly] Mass rebuild for x264
by Sérgio M. Basto
commit 473ad6fdfc4717e504bd3fce5cd04d67388a4ef0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 7 03:57:24 2020 +0100
Mass rebuild for x264
gstreamer1-plugins-ugly.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index 986ca9b..5b117ae 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -3,7 +3,7 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
Version: 1.17.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/%{src_name}/%{src_name}-%{version}.tar.xz
@@ -72,6 +72,9 @@ gstreamer-plugins-good because:
%changelog
+* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 1.17.1-2
+- Mass rebuild for x264
+
* Mon Jun 22 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.17.1-1
- 1.17.1
3 years, 10 months
[gstreamer-plugins-ugly] Mass rebuild for x264
by Sérgio M. Basto
commit f54ed4f5faebddbaf94b616d67cb7412c4da8c60
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 7 03:51:12 2020 +0100
Mass rebuild for x264
gstreamer-plugins-ugly.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index 56f9b68..8eb8e99 100644
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.19
-Release: 35%{?dist}
+Release: 36%{?dist}
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
@@ -125,6 +125,9 @@ gstreamer-plugins-good because:
%changelog
+* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 0.10.19-36
+- Mass rebuild for x264
+
* Wed Jul 01 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.19-35
- bump to pass rpmfusion-free-obsolete-packages
3 years, 10 months
[x264] Update to 0.160-20200702gitcde9a93 (stable branch)
by Sérgio M. Basto
commit 8ecc6a6074d3900377e73c0626b80b271477b8eb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 7 02:53:47 2020 +0100
Update to 0.160-20200702gitcde9a93 (stable branch)
.gitignore | 1 +
7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff | 2 +-
sources | 2 +-
x264-gpac.patch | 2 +-
x264.spec | 15 +++++++++------
5 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5ba5c6..238f5fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ x264-0.148-20160118-5c65704.tar.bz2
/x264-0.157-20190717-34c06d1.tar.bz2
/x264-0.159-20191127git1771b55.tar.bz2
/x264-0.159-20200409git296494a.tar.bz2
+/x264-0.160-20200702gitcde9a93.tar.bz2
diff --git a/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff
index fd653bd..9455c0c 100644
--- a/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff
+++ b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff
@@ -3,7 +3,7 @@ index 51c896e901c5d4bb3ac4408e005380f64fb8f230..78aa11404e414db6168aef920e7e6bda
--- a/configure
+++ b/configure
@@ -1232,15 +1232,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
- for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do
+ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do
cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
done
+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
diff --git a/sources b/sources
index 49ff700..0129c97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (x264-0.159-20200409git296494a.tar.bz2) = fd7f4b532973c76f2b3f37dec49420285a01918cc7fffadecacdc7cf8debb4b87c13b40c3b9e0e842d6233800bbf33e5d2346d4a9d475ec16cd6db57abe98335
+SHA512 (x264-0.160-20200702gitcde9a93.tar.bz2) = e5bb02aa7c20b939e1a949268acc56a34980c8793221e9c1fcde26d0905305bf9753b1c05218b44ed186777e0578bf38438eaf22535bc7b2e7ab1fffd9ab983e
diff --git a/x264-gpac.patch b/x264-gpac.patch
index e43bff0..97f4cd9 100644
--- a/x264-gpac.patch
+++ b/x264-gpac.patch
@@ -5,7 +5,7 @@
gpac="no"
GPAC_LIBS="-lgpac_static"
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
-+ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do
++ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do
+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
+ done
if [ "$SYS" = "WINDOWS" ] ; then
diff --git a/x264.spec b/x264.spec
index 4a14974..23b897b 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.159-20200409git296494a.tar.bz2
-%global api 159
-%global gitdate 20200409
-%global gitversion 296494a
+# globals for x264-0.160-20200702gitcde9a93.tar.bz2
+%global api 160
+%global gitdate 20200702
+%global gitversion cde9a93
%global snapshot %{gitdate}git%{gitversion}
%global gver .%{gitdate}git%{gitversion}
@@ -41,7 +41,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -56,7 +56,7 @@ Patch11: x264-opencl.patch
Patch12: 7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff
BuildRequires: gcc
-%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel }
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
@@ -219,6 +219,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Mon Jul 06 2020 Sérgio Basto <sergio(a)serjux.com> - 0.160-1.20200702gitcde9a93
+- Update to 0.160-20200702gitcde9a93 (stable branch)
+
* Mon Jul 06 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 0.159-11.20200409git296494a
- Bump
3 years, 10 months
[unifi/f31] (3 commits) ...Update to 5.13.32.
by Richard Shaw
Summary of changes:
d5f80cf... Add automated bundled provides script proided by Alex Jacoc (*)
7b2699a... Update to 5.13.29. (*)
e8be68d... Update to 5.13.32. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[unifi/f32] (3 commits) ...Update to 5.13.32.
by Richard Shaw
Summary of changes:
d5f80cf... Add automated bundled provides script proided by Alex Jacoc (*)
7b2699a... Update to 5.13.29. (*)
e8be68d... Update to 5.13.32. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[kodi] Kodi 19 git sources
by Michael Cronenworth
commit f14355036087105fac50e36e35cc22a13067858d
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Jul 6 18:59:39 2020 -0500
Kodi 19 git sources
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index ffa6b01..2957e56 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-18.6-patched.tar.xz) = dbff33be5821a06836b5a9672c6460c1e2a6ba62fd62aa6f27e42cf9d3cab7d894ac558ee36c6951bbe84403fda7b0f178204d63292995a06e366688c4ca2d47
+SHA512 (kodi-19.0-b6daed5-patched.tar.xz) = fe16c7c90d07edb058a9eeab646ab8386a5c8c5d32ad2e78b9057464eb9d2df8976c93f6f59ba2972d0bf1ff8e1e8ad0cdb343e19314fbd174d3a13276449fbc
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, 10 months
[kodi] Rebase against Kodi 19 git snapshots
by Michael Cronenworth
commit c211fe65f87b01e0d526f578d3b84ecc901dcecf
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Jul 6 18:56:16 2020 -0500
Rebase against Kodi 19 git snapshots
kodi-18-assert.patch | 21 -
kodi-18-libfmt.patch | 44 --
kodi-18-python3-0001.patch | 54 ---
kodi-18-python3-0002.patch | 931 ---------------------------------------
kodi-18-python3-0003.patch | 370 ----------------
kodi-18.0-versioning.patch | 12 -
kodi-19-httprequesthandler.patch | 20 +
kodi-19-python.patch | 41 ++
kodi-19-versioning.patch | 11 +
kodi-19-webserver.patch | 29 ++
kodi-generate-tarball-xz.sh | 14 +-
kodi.spec | 59 +--
12 files changed, 132 insertions(+), 1474 deletions(-)
---
diff --git a/kodi-19-httprequesthandler.patch b/kodi-19-httprequesthandler.patch
new file mode 100644
index 0000000..e0b279c
--- /dev/null
+++ b/kodi-19-httprequesthandler.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp 2020-07-05 15:50:53.000000000 -0500
++++ b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp 2020-07-06 18:19:35.362146987 -0500
+@@ -41,7 +41,7 @@ int HTTPRequestHandlerUtils::GetRequestH
+ if (connection == nullptr)
+ return -1;
+
+- return MHD_get_connection_values(connection, kind, FillArgumentMap, &headerValues);
++ return MHD_get_connection_values(connection, kind, (MHD_KeyValueIterator)FillArgumentMap, &headerValues);
+ }
+
+ int HTTPRequestHandlerUtils::GetRequestHeaderValues(struct MHD_Connection *connection, enum MHD_ValueKind kind, std::multimap<std::string, std::string> &headerValues)
+@@ -49,7 +49,7 @@ int HTTPRequestHandlerUtils::GetRequestH
+ if (connection == nullptr)
+ return -1;
+
+- return MHD_get_connection_values(connection, kind, FillArgumentMultiMap, &headerValues);
++ return MHD_get_connection_values(connection, kind, (MHD_KeyValueIterator)FillArgumentMultiMap, &headerValues);
+ }
+
+ bool HTTPRequestHandlerUtils::GetRequestedRanges(struct MHD_Connection *connection, uint64_t totalLength, CHttpRanges &ranges)
diff --git a/kodi-19-python.patch b/kodi-19-python.patch
new file mode 100644
index 0000000..3bddb90
--- /dev/null
+++ b/kodi-19-python.patch
@@ -0,0 +1,41 @@
+--- a/xbmc/interfaces/python/PythonInvoker.cpp 2020-07-05 15:50:53.000000000 -0500
++++ b/xbmc/interfaces/python/PythonInvoker.cpp 2020-07-06 18:15:35.325028237 -0500
+@@ -10,17 +10,6 @@
+ #include <Python.h>
+ #include <iterator>
+
+-// This is a workaround to compile Kodi against python 3.8
+-//! @todo implement a compliant way to get access to the chain of thread states
+-#if PY_VERSION_HEX >= 0x03080000
+-# define Py_BUILD_CORE
+-# undef HAVE_STD_ATOMIC
+-/* for access to the fields of PyInterpreterState */
+-# include <internal/pycore_pystate.h>
+-# undef Py_BUILD_CORE
+-# define HAVE_STD_ATOMIC
+-#endif
+-
+ #include "Application.h"
+ #include "PythonInvoker.h"
+ #include "ServiceBroker.h"
+@@ -406,9 +395,9 @@ bool CPythonInvoker::execute(const std::
+ // make sure all sub threads have finished
+ for (PyThreadState* old = nullptr; m_threadState != nullptr;)
+ {
+- PyThreadState* s = m_threadState->interp->tstate_head;
++ PyThreadState* s = PyInterpreterState_ThreadHead(m_threadState->interp);
+ for (; s && s == m_threadState;)
+- s = s->next;
++ s = PyThreadState_Next(s);
+
+ if (!s)
+ break;
+@@ -536,7 +525,7 @@ bool CPythonInvoker::stop(bool abort)
+ PyEval_RestoreThread((PyThreadState*)m_threadState);
+ }
+
+- for (PyThreadState* state = ((PyThreadState*)m_threadState)->interp->tstate_head; state; state = state->next)
++ for (PyThreadState* state = PyInterpreterState_ThreadHead(m_threadState->interp); state; state = PyThreadState_Next(state))
+ {
+ // Raise a SystemExit exception in python threads
+ Py_XDECREF(state->async_exc);
diff --git a/kodi-19-versioning.patch b/kodi-19-versioning.patch
new file mode 100644
index 0000000..317bed3
--- /dev/null
+++ b/kodi-19-versioning.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/Application.cpp 2020-07-05 15:50:53.000000000 -0500
++++ b/xbmc/Application.cpp 2020-07-06 17:37:10.892852743 -0500
+@@ -439,7 +439,7 @@ bool CApplication::Create(const CAppPara
+ init_emu_environ();
+
+ CLog::Log(LOGINFO, "-----------------------------------------------------------------------");
+- CLog::Log(LOGINFO, "Starting %s (%s). Platform: %s %s %d-bit", CSysInfo::GetAppName().c_str(),
++ CLog::Log(LOGINFO, "Starting %s from RPM Fusion (%s). Platform: %s %s %d-bit", CSysInfo::GetAppName().c_str(),
+ CSysInfo::GetVersion().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(),
+ g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetXbmcBitness());
+
diff --git a/kodi-19-webserver.patch b/kodi-19-webserver.patch
new file mode 100644
index 0000000..6d351a3
--- /dev/null
+++ b/kodi-19-webserver.patch
@@ -0,0 +1,29 @@
+--- a/xbmc/network/WebServer.cpp 2020-07-05 15:50:53.000000000 -0500
++++ b/xbmc/network/WebServer.cpp 2020-07-06 17:24:42.764074424 -0500
+@@ -510,7 +510,7 @@
+ return;
+
+ // otherwise we can use MHD's POST processor
+- connectionHandler->postprocessor = MHD_create_post_processor(request.connection, MAX_POST_BUFFER_SIZE, &CWebServer::HandlePostField, static_cast<void*>(connectionHandler));
++ connectionHandler->postprocessor = MHD_create_post_processor(request.connection, MAX_POST_BUFFER_SIZE, (MHD_PostDataIterator)(&CWebServer::HandlePostField), static_cast<void*>(connectionHandler));
+
+ // MHD doesn't seem to be able to handle this post request
+ if (connectionHandler->postprocessor == nullptr)
+@@ -1155,7 +1155,7 @@
+ port,
+ 0,
+ 0,
+- &CWebServer::AnswerToConnection,
++ (MHD_AccessHandlerCallback)(&CWebServer::AnswerToConnection),
+ this,
+
+ MHD_OPTION_CONNECTION_LIMIT, 512,
+@@ -1182,7 +1182,7 @@
+ port,
+ 0,
+ 0,
+- &CWebServer::AnswerToConnection,
++ (MHD_AccessHandlerCallback)(&CWebServer::AnswerToConnection),
+ this,
+
+ MHD_OPTION_CONNECTION_LIMIT, 512,
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 9475bd5..b8d6585 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,15 +1,15 @@
#!/bin/sh
-MAJORVERSION=18
-MINORVERSION=6
-#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
-#GITSHORT=ge988513
-CODENAME=Leia
+MAJORVERSION=19
+MINORVERSION=0
+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 20508b4..ef56cff 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,7 +1,8 @@
#global PRERELEASE rc5
-%global DIRVERSION %{version}
-#global GITCOMMIT Gotham_r2-ge988513
+#global DIRVERSION %{version}
+%global GITCOMMIT b6daed5
# use the line below for pre-releases
+%global DIRVERSION %{version}-%{GITCOMMIT}
#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
@@ -33,8 +34,8 @@
%endif
Name: kodi
-Version: 18.6
-Release: 3%{?dist}
+Version: 19.0
+Release: 0.20200705gitb6daed5%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -66,7 +67,7 @@ Source5: ffmpeg-4.0.4-Leia-18.4.tar.gz
%endif
# Set program version parameters
-Patch1: kodi-18.0-versioning.patch
+Patch1: kodi-19-versioning.patch
# Prevent trousers from being linked, which breaks Samba
Patch2: kodi-18-trousers.patch
@@ -74,25 +75,15 @@ Patch2: kodi-18-trousers.patch
# Fix an annobin issue
Patch3: kodi-18-annobin-workaround.patch
-# Python 3 support
-# https://github.com/xbmc/xbmc/commits/feature_python3
-# https://github.com/xbmc/xbmc/issues/16560
-Patch4: kodi-18-python3-0001.patch
-Patch5: kodi-18-python3-0002.patch
-# apply latest git master work for Python 3 crashing fixes
-Patch6: kodi-18-python3-0003.patch
-
-# Fix missing include (gcc requirement)
-Patch7: kodi-18-assert.patch
-
# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
-Patch8: kodi-18-brp-mangle-shebangs.patch
+Patch4: kodi-18-brp-mangle-shebangs.patch
+
+# GCC/libmicrohttpd casting fix
+Patch5: kodi-19-webserver.patch
+Patch6: kodi-19-httprequesthandler.patch
-# libfmt change fixed an issue that broke Kodi, both libfmt and Kodi fixed it, but we can apply the Kodi-only fix
-# https://github.com/fmtlib/fmt/issues/1620
-# https://github.com/xbmc/xbmc/issues/17629
-# https://github.com/xbmc/xbmc/pull/17683
-Patch9: kodi-18-libfmt.patch
+# Python 3.9 fix
+Patch7: kodi-19-python.patch
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -145,6 +136,7 @@ BuildRequires: giflib-devel
BuildRequires: glew-devel
BuildRequires: glib2-devel
BuildRequires: gperf
+BuildRequires: gtest-devel
BuildRequires: jasper-devel
BuildRequires: java-devel
BuildRequires: lame-devel
@@ -229,6 +221,7 @@ BuildRequires: python2-pillow
%endif
BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
+BuildRequires: spdlog-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: systemd-devel
@@ -372,20 +365,11 @@ This package contains the Kodi binary for X11 servers.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.trousers
-
-%if 0%{?fedora} > 29
%patch3 -p1 -b.innobinfix
-%endif
-
-%if 0%{?fedora} > 31
-%patch4 -p1 -b.python3-0001
-%patch5 -p1 -b.python3-0002
-%patch6 -p1 -b.python3-0003
-%endif
-
-%patch7 -p1 -b.assert
-%patch8 -p1 -b.brp-mangle-shebangs
-%patch9 -p1 -b.libfmt
+%patch4 -p1 -b.brp-mangle-shebangs
+%patch5 -p1 -b.webserver
+%patch6 -p1 -b.httprequesthandler
+%patch7 -p1 -b.python
# Fix up Python shebangs
%if 0%{?fedora} > 31
@@ -437,9 +421,11 @@ do
%endif
-DCORE_PLATFORM_NAME=$BACKEND \
%ifarch x86_64 i686
+ -DX11_RENDER_SYSTEM=gl \
-DWAYLAND_RENDER_SYSTEM=gl \
-DGBM_RENDER_SYSTEM=gl \
%else
+ -DX11_RENDER_SYSTEM=gles \
-DWAYLAND_RENDER_SYSTEM=gles \
-DGBM_RENDER_SYSTEM=gles \
%endif
@@ -566,6 +552,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Mon Jul 06 2020 Michael Cronenworth <mike(a)cchtml.com> - 19.0-0.20200705gitb6daed5
+- Initial version 19 snapshot
+
* Sun Apr 26 2020 Michael Cronenworth <mike(a)cchtml.com> - 18.6-3
- Python 3 and libfmt fixes
3 years, 10 months
