[mythtv/f32] (2 commits) ...Update to latest fixes/31.
by Richard Shaw
Summary of changes:
b3d5377... Update service files to include instructions for using syst (*)
8870f14... Update to latest fixes/31. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[mythtv/f33] (2 commits) ...Update to latest fixes/31.
by Richard Shaw
Summary of changes:
b3d5377... Update service files to include instructions for using syst (*)
8870f14... Update to latest fixes/31. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[gstreamer1-libav/f33] 1.18.1
by Leigh Scott
Summary of changes:
e32edc9... 1.18.1 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[kodi] Update build section for new, single build type
by Michael Cronenworth
commit 8e5a0f130fef08b4f573d90d4deb2be139a70886
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Nov 2 21:58:08 2020 -0600
Update build section for new, single build type
kodi.spec | 102 +++++++++++++-------------------------------------------------
1 file changed, 21 insertions(+), 81 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 0db9d74..5d8f339 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -232,24 +232,7 @@ BuildRequires: waylandpp-devel
BuildRequires: yajl-devel
BuildRequires: zlib-devel
-# Install major backends, users can remove them individually
-Requires: %{name}-common = %{version}-%{release}
-Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server)
-Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg)
Requires: (%{name}-firewalld = %{version}-%{release} if firewalld)
-
-
-%description
-Kodi is a free cross-platform media-player jukebox and entertainment hub.
-Kodi can play a spectrum of of multimedia formats, and featuring playlist,
-audio visualizations, slideshow, and weather forecast functions, together
-third-party plugins.
-
-This is a meta package.
-
-
-%package common
-Summary: Common Kodi files and binaries
Requires: dejavu-sans-fonts
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
@@ -280,8 +263,22 @@ Requires: xorg-x11-utils
# and for installation
Requires: python3-pillow%{?_isa}
-%description common
-Common Kodi files and binaries
+# https://github.com/xbmc/xbmc/pull/18534
+Provides: kodi-common = %{version}-%{release}
+Obsoletes: kodi-common < %{version}-%{release}
+Provides: kodi-gbm = %{version}-%{release}
+Obsoletes: kodi-gbm < %{version}-%{release}
+Provides: kodi-wayland = %{version}-%{release}
+Obsoletes: kodi-wayland < %{version}-%{release}
+Provides: kodi-x11 = %{version}-%{release}
+Obsoletes: kodi-x11 < %{version}-%{release}
+
+
+%description
+Kodi is a free cross-platform media-player jukebox and entertainment hub.
+Kodi can play a spectrum of of multimedia formats, and featuring playlist,
+audio visualizations, slideshow, and weather forecast functions, together
+third-party plugins.
%package devel
@@ -326,33 +323,6 @@ Requires(post): firewalld-filesystem
This package contains FirewallD files for Kodi.
-%package gbm
-Summary: Kodi binary for Generic Buffer Management
-Requires: %{name}-common = %{version}-%{release}
-
-
-%description gbm
-This package contains the Kodi binary for Generic Buffer Management.
-
-
-%package wayland
-Summary: Kodi binary for Wayland compositors
-Requires: %{name}-common = %{version}-%{release}
-
-
-%description wayland
-This package contains the Kodi binary for Wayland compositors.
-
-
-%package x11
-Summary: Kodi binary for X11 servers
-Requires: %{name}-common = %{version}-%{release}
-
-
-%description x11
-This package contains the Kodi binary for X11 servers.
-
-
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
@@ -377,11 +347,6 @@ sed -i 's/ pkg_check_modules(PC_PYTHON python>=2.7 QUIET)/ pkg_check_modules(P
%build
-mkdir {fedora-gbm,fedora-wayland,fedora-x11}
-
-for BACKEND in %{kodi_backends}
-do
- pushd fedora-$BACKEND
%cmake3 \
%if %{with dvdcss}
-DLIBDVDCSS_URL=%{SOURCE4} \
@@ -403,21 +368,14 @@ do
-DLIBDVDNAV_URL=%{SOURCE2} \
-DLIBDVDREAD_URL=%{SOURCE3} \
-DPYTHON_EXECUTABLE=%{__python3} \
- -DCORE_PLATFORM_NAME=$BACKEND \
+ -DCORE_PLATFORM_NAME="%{kodi_backends}" \
-DAPP_RENDER_SYSTEM=gl \
- ../
- %ninja_build
- popd
-done
+ .
+%ninja_build
%install
-for BACKEND in %{kodi_backends}
-do
- pushd fedora-$BACKEND
- %ninja_install
- popd
-done
+%ninja_install
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
@@ -453,18 +411,13 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%files
-
-
-%files common
%license LICENSE.md LICENSES/
%doc README.md docs
%{_bindir}/kodi
%{_bindir}/kodi-standalone
%{_bindir}/JsonSchemaBuilder
%{_bindir}/TexturePacker
-%dir %{_libdir}/kodi/
-%{_libdir}/kodi/addons/
-%{_libdir}/kodi/system/
+%{_libdir}/kodi/
%{_datadir}/kodi/
%{_datadir}/xsessions/kodi.desktop
%{_datadir}/applications/kodi.desktop
@@ -506,19 +459,6 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%{_prefix}/lib/firewalld/services/kodi-jsonrpc.xml
-%files gbm
-%{_libdir}/kodi/kodi-gbm
-
-
-%files wayland
-%{_libdir}/kodi/kodi-wayland
-
-
-%files x11
-%{_libdir}/kodi/kodi-x11
-%{_libdir}/kodi/kodi-xrandr
-
-
%changelog
* Mon Nov 02 2020 Michael Cronenworth <mike(a)cchtml.com> - 19.0-0.6.20201031gitbb0699d
- Kodi 19.0 alpha 3
4 years
[kodi] Update to 19.0 alpha 3
by Michael Cronenworth
commit 7590d9e08d6e564ce126c42f339ab51e24d9a2d4
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Nov 2 17:11:20 2020 -0600
Update to 19.0 alpha 3
kodi-19-python3-0.patch | 216 ---------------
kodi-19-python3-1.patch | 345 ------------------------
kodi-19-python3-2.patch | 632 --------------------------------------------
kodi-19-python3-3.patch | 82 ------
kodi-19-python3-4.patch | 66 -----
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 23 +-
sources | 2 +-
8 files changed, 8 insertions(+), 1360 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 5395f2d..9085e86 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=19
-MINORVERSION=0a2
+MINORVERSION=0a3
#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
#GITSHORT=b6daed5
CODENAME=Matrix
diff --git a/kodi.spec b/kodi.spec
index bad179d..0db9d74 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,6 +1,6 @@
# Use old cmake macro
%global __cmake_in_source_build 1
-%global PRERELEASE a2
+%global PRERELEASE a3
%global DIRVERSION %{version}
#global GITCOMMIT db40b2a
# use the line below for pre-releases
@@ -42,7 +42,7 @@
Name: kodi
Version: 19.0
-Release: 0.5.20201005git54be31b%{?dist}
+Release: 0.6.20201031gitbb0699d%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -85,13 +85,6 @@ Patch3: kodi-18-annobin-workaround.patch
# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
Patch4: kodi-18-brp-mangle-shebangs.patch
-# Python 3.9 support
-Patch5: kodi-19-python3-0.patch
-Patch6: kodi-19-python3-1.patch
-Patch7: kodi-19-python3-2.patch
-Patch8: kodi-19-python3-3.patch
-Patch9: kodi-19-python3-4.patch
-
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -366,11 +359,6 @@ 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.python39-0
-%patch6 -p1 -b.python39-1
-%patch7 -p1 -b.python39-2
-%patch8 -p1 -b.python39-3
-%patch9 -p1 -b.python39-4
# Fix up Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
@@ -416,9 +404,7 @@ do
-DLIBDVDREAD_URL=%{SOURCE3} \
-DPYTHON_EXECUTABLE=%{__python3} \
-DCORE_PLATFORM_NAME=$BACKEND \
- -DX11_RENDER_SYSTEM=gl \
- -DWAYLAND_RENDER_SYSTEM=gl \
- -DGBM_RENDER_SYSTEM=gl \
+ -DAPP_RENDER_SYSTEM=gl \
../
%ninja_build
popd
@@ -534,6 +520,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Mon Nov 02 2020 Michael Cronenworth <mike(a)cchtml.com> - 19.0-0.6.20201031gitbb0699d
+- Kodi 19.0 alpha 3
+
* Thu Oct 29 2020 Michael Cronenworth <mike(a)cchtml.com> - 19.0-0.5.20201005git54be31b
- Python 3.9 support
diff --git a/sources b/sources
index 218b69d..0fab010 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-19.0a2-patched.tar.xz) = 44a7984120783bc52fa8bede4a24a1d8cfbf69ffe5debea7973a4e17a5377545b8d86f3cec2b41365d2cd74e7931c1acb15a67025d96bc5d80f303b3b7f39e06
+SHA512 (kodi-19.0a3-patched.tar.xz) = 1d95a5e135f0968844ba31b0fd78c8dfd06b0fa68a2b0ea3a8782db5010adbb4faa200881215a04a77d90c258ccdcba799c704f7a3e8fd216099d9a4bf66532a
SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) = 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) = b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
4 years
