Request 6048 (accepted)

Overview

Request 6048 (accepted)

- Use https:// URLs only.
- Pipewire currently creates more issues than benefits on Leap;
use new conditional "kodi_without_pipewire" to enable or disable it.
We default to disable it now on Leap.

Created by manfred-h 6 months ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:manfred-h / kodi to package Multimedia / kodi

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -42,6 +42,14 @@
 %bcond_with kodi_with_wayland
 %endif
 
+%if 0%{?suse_version} < 1550
+# Pipewire currently creates more issues than benefits; disable it for now:
+%bcond_without kodi_without_pipewire
+%else
+# Leave PW enabled on Tumbleweed:
+%bcond_with kodi_without_pipewire
+%endif
+
 %define kodi_platform raspberry-pi
 %define kodi_player omxplayer
 
@@ -66,7 +74,7 @@
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            http://kodi.tv/
+Url:            https://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
@@ -75,12 +83,12 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
@@ -90,7 +98,9 @@
 %if %{without kodi_with_wayland}
 Patch3:         0003-kodi-disable-wayland.patch
 %endif
+%if %{without kodi_without_pipewire}
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -306,10 +316,12 @@
 %else
 BuildRequires: googletest-devel
 %endif
-#
+
+%if %{without kodi_without_pipewire}
 # pipewire
 BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libspa-0.2)
+%endif
 #
 %{?systemd_requires}
 
@@ -427,6 +439,9 @@
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
     -DPYTHON_VER=3.11 \
+%if %{with kodi_without_pipewire}
+    -DENABLE_PIPEWIRE=OFF \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi-noX-raspberry-pi2.spec Changed

@@ -42,6 +42,14 @@
 %bcond_with kodi_with_wayland
 %endif
 
+%if 0%{?suse_version} < 1550
+# Pipewire currently creates more issues than benefits; disable it for now:
+%bcond_without kodi_without_pipewire
+%else
+# Leave PW enabled on Tumbleweed:
+%bcond_with kodi_without_pipewire
+%endif
+
 %define kodi_platform raspberry-pi2
 %define kodi_player omxplayer
 
@@ -66,7 +74,7 @@
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            http://kodi.tv/
+Url:            https://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
@@ -75,12 +83,12 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
@@ -90,7 +98,9 @@
 %if %{without kodi_with_wayland}
 Patch3:         0003-kodi-disable-wayland.patch
 %endif
+%if %{without kodi_without_pipewire}
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -306,10 +316,12 @@
 %else
 BuildRequires: googletest-devel
 %endif
-#
+
+%if %{without kodi_without_pipewire}
 # pipewire
 BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libspa-0.2)
+%endif
 #
 %{?systemd_requires}
 
@@ -427,6 +439,9 @@
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
     -DPYTHON_VER=3.11 \
+%if %{with kodi_without_pipewire}
+    -DENABLE_PIPEWIRE=OFF \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi-noX.spec Changed

@@ -42,6 +42,14 @@
 %bcond_with kodi_with_wayland
 %endif
 
+%if 0%{?suse_version} < 1550
+# Pipewire currently creates more issues than benefits; disable it for now:
+%bcond_without kodi_without_pipewire
+%else
+# Leave PW enabled on Tumbleweed:
+%bcond_with kodi_without_pipewire
+%endif
+
 %define kodi_platform none
 %define kodi_player none
 
@@ -66,7 +74,7 @@
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            http://kodi.tv/
+Url:            https://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
@@ -75,12 +83,12 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
@@ -90,7 +98,9 @@
 %if %{without kodi_with_wayland}
 Patch3:         0003-kodi-disable-wayland.patch
 %endif
+%if %{without kodi_without_pipewire}
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -306,10 +316,12 @@
 %else
 BuildRequires: googletest-devel
 %endif
-#
+
+%if %{without kodi_without_pipewire}
 # pipewire
 BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libspa-0.2)
+%endif
 #
 %{?systemd_requires}
 
@@ -427,6 +439,9 @@
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
     -DPYTHON_VER=3.11 \
+%if %{with kodi_without_pipewire}
+    -DENABLE_PIPEWIRE=OFF \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi.spec Changed

@@ -42,6 +42,14 @@
 %bcond_with kodi_with_wayland
 %endif
 
+%if 0%{?suse_version} < 1550
+# Pipewire currently creates more issues than benefits; disable it for now:
+%bcond_without kodi_without_pipewire
+%else
+# Leave PW enabled on Tumbleweed:
+%bcond_with kodi_without_pipewire
+%endif
+
 %define kodi_platform none
 %define kodi_player none
 
@@ -66,7 +74,7 @@
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            http://kodi.tv/
+Url:            https://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
@@ -75,12 +83,12 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
@@ -90,7 +98,9 @@
 %if %{without kodi_with_wayland}
 Patch3:         0003-kodi-disable-wayland.patch
 %endif
+%if %{without kodi_without_pipewire}
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -306,10 +316,12 @@
 %else
 BuildRequires: googletest-devel
 %endif
-#
+
+%if %{without kodi_without_pipewire}
 # pipewire
 BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libspa-0.2)
+%endif
 #
 %{?systemd_requires}
 
@@ -427,6 +439,9 @@
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
     -DPYTHON_VER=3.11 \
+%if %{with kodi_without_pipewire}
+    -DENABLE_PIPEWIRE=OFF \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

Build Results
RPM Lint

Refresh

Comments for request 6048 0

Request History

manfred-h created request 6 months ago

- Use https:// URLs only.
- Pipewire currently creates more issues than benefits on Leap;
use new conditional "kodi_without_pipewire" to enable or disable it.
We default to disable it now on Leap.

sagiben accepted request 6 months ago