[mixxx/f39: 3/3] Merge branch 'master' into f39
by Luís Correia
commit 9cfa89a579808064aabd40e64b0b2c68703eebe3
Merge: e3af11a 3dbbe16
Author: Luis Correia <luis.f.correia(a)gmail.com>
Date: Sat Feb 17 22:21:58 2024 +0000
Merge branch 'master' into f39
mixxx.spec | 11 +++++++----
sources | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
9 months, 1 week
[mixxx/f39] (3 commits) ...Merge branch 'master' into f39
by Luís Correia
Summary of changes:
850d55b... New upstream release 2.4.0 (adds missing translations) (*)
3dbbe16... New upstream release 2.4.0 (adds missing translations) (*)
9cfa89a... Merge branch 'master' into f39
(*) This commit already existed in another branch; no separate mail sent
9 months, 1 week
[kodi-inputstream-adaptive/f39] Update to 20.3.17
by Michael Cronenworth
commit 2777e10646435291268e59da62de4a21e2c68eba
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 17 14:18:19 2024 +0000
Update to 20.3.17
kodi-inputstream-adaptive.spec | 15 +++++++++------
sources | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index bf1b080..2151ea3 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -8,8 +8,8 @@
%global internal_bento4_tag %{internal_bento4_version}-7-Omega
Name: kodi-inputstream-adaptive
-Version: 20.3.14
-Release: 2%{?dist}
+Version: 20.3.17
+Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
# - wvdecrypter contains parts of Chromium CDM under
@@ -23,7 +23,7 @@ Source2: %{name}.metainfo.xml
# Fix build with GCC 13
Patch0: %{name}-20.3.13-gcc13.patch
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: libappstream-glib
@@ -45,12 +45,12 @@ ExcludeArch: %{power64}
%build
-%cmake3 -DENABLE_INTERNAL_BENTO4=1 -DBENTO4_URL=%{SOURCE1}
-%cmake3_build
+%cmake -DENABLE_INTERNAL_BENTO4=1 -DBENTO4_URL=%{SOURCE1}
+%cmake_build
%install
-%cmake3_install
+%cmake_install
# Install AppData file
install -Dpm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml
@@ -73,6 +73,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Sat Feb 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 20.3.17-1
+- Update to 20.3.17
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 20.3.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index 3d8cfe8..9ccb697 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (inputstream.adaptive-20.3.17-Nexus.tar.gz) = 95691d8894b287e061a624a6b99f72920de2a5ab338897f211e6df2554d3d59106d0d3612825b673a0cf8bb9d054350c7bc7612a1e99f958b3525afb76fdb54e
SHA512 (Bento4-1.6.0-639-7-Omega.tar.gz) = bf257e5831eec44db944d1313858262c1ba32b6e67564bb8f809a1aa0fc8a55faaaac2357d80f1ce2e794914f6bec5263548e77802db2b9e52998af2b6276809
-SHA512 (inputstream.adaptive-20.3.14-Nexus.tar.gz) = 13c8773aede96362ce48b1ce11133275a1ac9e4b3b1d89afc58d6bb91ca09207d65a91d130349ff599139c6c13e4497af2f7ad6f15494a0b29074be19f2b082d
9 months, 1 week
[kodi-inputstream-adaptive/f39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
by Michael Cronenworth
commit 4cd425e85235a1c496782c3bc0dd90f03dbebe87
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Feb 3 20:27:57 2024 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com>
kodi-inputstream-adaptive.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 124e4ff..bf1b080 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -9,7 +9,7 @@
Name: kodi-inputstream-adaptive
Version: 20.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
# - wvdecrypter contains parts of Chromium CDM under
@@ -73,6 +73,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 20.3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Sat Nov 11 2023 Michael Cronenworth <mike(a)cchtml.com> - 20.3.14-1
- Update to 20.3.14
9 months, 1 week
[mixxx] New upstream release 2.4.0 (adds missing translations)
by Luís Correia
commit 3dbbe16d0078fb2c64e0f9526161d67bff581991
Author: Luis Correia <luis.f.correia(a)gmail.com>
Date: Sat Feb 17 22:02:23 2024 +0000
New upstream release 2.4.0 (adds missing translations)
mixxx.spec | 2 +-
sources | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index e0e2e75..9fd71a9 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -222,7 +222,7 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
-* Fri Feb 17 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-2
+* Fri Feb 16 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-2
- New upstream release 2.4.0
* Wed Feb 14 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-1
diff --git a/sources b/sources
index fc8d32d..03fe294 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+SHA512 (libdjinterop-0.20.1.tar.gz) = 2f75a57326cc958bce6634aba407707313cec646d1713c80d9286d9d2448a68dd304eacd02b38c237a6bb869f07b9b3d3b1cc7fcb7c3a9cdf6ba7515166be6cf
+SHA512 (libkeyfinder-2.2.6.zip) = 23ffcc4da59019349824b60dd1b125d559f39d7731fe7f00cdc8f4a97a342fa59ef5183c4e272ff4c5fd06eaa89c581e07fdb26bcfd3c98cc42d2dcc29e13e1e
SHA512 (mixxx-2.4.0.tar.gz) = cde73d5824b3c700b3b2baf853a8cc4f338431363a05e0052197d06c3a97d09fc27b1748d9ffc8448c9a8715dc969d9af797b6021a2c5ddbc8d3418fa0eaf486
9 months, 1 week
[mixxx] New upstream release 2.4.0 (adds missing translations)
by Luís Correia
commit 850d55b2caed73c3b4a863d218b3aea64fca0f5a
Author: Luis Correia <luis.f.correia(a)gmail.com>
Date: Sat Feb 17 22:01:15 2024 +0000
New upstream release 2.4.0 (adds missing translations)
mixxx.spec | 11 +++++++----
sources | 4 +---
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 74463db..e0e2e75 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -4,12 +4,12 @@
%endif
# Optional: Package version suffix for pre-releases, e.g. "beta" or "rc"
-%global extraver beta
+#global extraver beta
# Optional: Only used for untagged snapshot versions
-%global gitcommit d225a5112166e9224e0c61cdc413b9145d009c06
+#global gitcommit d225a5112166e9224e0c61cdc413b9145d009c06
# Format: <yyyymmdd>
-%global gitcommitdate 20240214
+#global gitcommitdate 20240214
# Additional sources
%global libkeyfinder_version 2.2.6
@@ -28,7 +28,7 @@
Name: mixxx
Version: 2.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -222,6 +222,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Fri Feb 17 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-2
+- New upstream release 2.4.0
+
* Wed Feb 14 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-1
- New upstream release 2.4.0
diff --git a/sources b/sources
index 1dc9883..fc8d32d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (mixxx-d225a5112166e9224e0c61cdc413b9145d009c06.tar.gz) = a72bbbe333f9dae78eab6139c01341f06bfdb03771453c8e6d5036207bd56db0dd131b2f309f68a244e28da41e245d7e577af9ec32581056aae4b736e902dedd
-SHA512 (libkeyfinder-2.2.6.zip) = 23ffcc4da59019349824b60dd1b125d559f39d7731fe7f00cdc8f4a97a342fa59ef5183c4e272ff4c5fd06eaa89c581e07fdb26bcfd3c98cc42d2dcc29e13e1e
-SHA512 (libdjinterop-0.20.1.tar.gz) = 2f75a57326cc958bce6634aba407707313cec646d1713c80d9286d9d2448a68dd304eacd02b38c237a6bb869f07b9b3d3b1cc7fcb7c3a9cdf6ba7515166be6cf
+SHA512 (mixxx-2.4.0.tar.gz) = cde73d5824b3c700b3b2baf853a8cc4f338431363a05e0052197d06c3a97d09fc27b1748d9ffc8448c9a8715dc969d9af797b6021a2c5ddbc8d3418fa0eaf486
9 months, 1 week
[kodi-pvr-mythtv/f40] Fix build
by Leigh Scott
Summary of changes:
99d70ef... Fix build (*)
(*) This commit already existed in another branch; no separate mail sent
9 months, 1 week
[kodi-pvr-mythtv] Fix build
by Leigh Scott
commit 99d70ef63a4bacc210f688fab19179411e146fcc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 17 15:35:39 2024 +0000
Fix build
buildfix_gcc14.patch | 12 ++++++++++++
kodi-pvr-mythtv.spec | 1 +
2 files changed, 13 insertions(+)
---
diff --git a/buildfix_gcc14.patch b/buildfix_gcc14.patch
new file mode 100644
index 0000000..f8168d4
--- /dev/null
+++ b/buildfix_gcc14.patch
@@ -0,0 +1,12 @@
+--- ./src/pvrclient-mythtv.cpp
++++ ./src/pvrclient-mythtv.cpp
+@@ -641,7 +641,7 @@
+ }
+ tag.SetEpisodePartNumber(EPG_TAG_INVALID_SERIES_EPISODE);
+ tag.SetParentalRating(0);
+- tag.SetStarRating(static_cast<int>(it->second->stars * 10.0));
++ tag.SetStarRating(static_cast<int>(std::stod(it->second->stars) * 10.0));
+ tag.SetOriginalTitle("");
+ tag.SetCast("");
+ tag.SetDirector("");
+
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index 258a8bb..12bccc2 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -17,6 +17,7 @@ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{versi
Source1: %{name}.metainfo.xml
# Use external cppmyth library
Patch0: %{name}-20.5.5-use_external_cppmyth.patch
+Patch1: buildfix_gcc14.patch
BuildRequires: cmake
BuildRequires: gcc-c++
9 months, 1 week
