Packman Build Service PMBS

kodi-noX-raspberry-pi.spec Changed

@@ -89,14 +89,18 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+#Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       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:       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
+#Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source24:       libudfread-1.1.2.tar.gz
+#Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source25:       apache-groovy-binary-4.0.16.zip
 # Tumbleweed fully switched to libpcre2; build libpcre internally:
-Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+#Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+Source26:       pcre-8.45.tar.bz2
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz

kodi-noX-raspberry-pi2.spec Changed

@@ -89,14 +89,18 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+#Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       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:       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
+#Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source24:       libudfread-1.1.2.tar.gz
+#Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source25:       apache-groovy-binary-4.0.16.zip
 # Tumbleweed fully switched to libpcre2; build libpcre internally:
-Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+#Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+Source26:       pcre-8.45.tar.bz2
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz

kodi-noX.spec Changed

@@ -35,12 +35,6 @@
 
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_with kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
-%else
-%bcond_with kodi_with_wayland
-%endif
 
 %if 0%{?suse_version} < 1550
 # Pipewire currently creates more issues than benefits; disable it for now:
@@ -89,23 +83,25 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+#Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       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:       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
+#Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source24:       libudfread-1.1.2.tar.gz
+#Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source25:       apache-groovy-binary-4.0.16.zip
 # Tumbleweed fully switched to libpcre2; build libpcre internally:
-Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+#Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+Source26:       pcre-8.45.tar.bz2
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
 ## %endif
 Patch1:         0001-crossguid-dgb.patch
 Patch2:         0002-kodi-install.patch
-%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
@@ -277,16 +273,6 @@
 %endif
 %endif
 BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -431,9 +417,6 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
-%endif
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
@@ -520,10 +503,8 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
 rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
 rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
 
 # TexturePacker likes to be installed as kodi-TexturePacker, too.
 if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
@@ -560,10 +541,6 @@
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 %{_datadir}/icons/*

kodi.spec Changed

@@ -35,12 +35,6 @@
 
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_without kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
-%else
-%bcond_with kodi_with_wayland
-%endif
 
 %if 0%{?suse_version} < 1550
 # Pipewire currently creates more issues than benefits; disable it for now:
@@ -89,23 +83,26 @@
 Source11:       kodi-noX.service
 
 # The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+
+#Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+Source20:       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:       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
+#Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source24:       libudfread-1.1.2.tar.gz
+#Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
+Source25:       apache-groovy-binary-4.0.16.zip
 # Tumbleweed fully switched to libpcre2; build libpcre internally:
-Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+#Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
+Source26:       pcre-8.45.tar.bz2
 
 ## %if 0%{without sysffmpeg}
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
 ## %endif
 Patch1:         0001-crossguid-dgb.patch
 Patch2:         0002-kodi-install.patch
-%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
@@ -277,16 +274,6 @@
 %endif
 %endif
 BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -431,9 +418,6 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
-%endif
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
@@ -520,10 +504,8 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
 rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
 rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
 
 # TexturePacker likes to be installed as kodi-TexturePacker, too.
 if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
@@ -560,10 +542,6 @@
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 %{_datadir}/icons/*

_service:download_files:apache-groovy-binary-4.0.16.zip Deleted

_service:download_files:crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz Deleted

_service:download_files:libudfread-1.1.2.tar.gz Deleted

_service:download_files:pcre-8.45.tar.bz2 Deleted

apache-groovy-binary-4.0.16.zip Added

crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz Added

libudfread-1.1.2.tar.gz Added

pcre-8.45.tar.bz2 Added

Difference Between Revision 12 and Multimedia / kodi