Packman Build Service PMBS

kodi.changes Changed

kodi.spec Changed

@@ -18,37 +18,13 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Omega
+%define kodi_version Piers
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
 
-# WARNING: Build with bundled ffmpeg until version 18.0 is reached
-# INFO: We are on version 21.0 in the meantime, so let's live with
-#  the system provided ffmpeg packages; if this won't work at some
-#  point in time in the future, uncomment the "sysffmpeg" stuff. In
-#  order to reduce downloading it every time, this is now commented!
-%bcond_without sysffmpeg
-## %if 0%{without sysffmpeg}
-## %define ffmpeg_version 5.1.2-Nexus-Alpha3
-## %endif
-
 # 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:
-%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
@@ -75,14 +51,13 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        21.3
+Version:        22.0b1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 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
 Source3:        kodi.VERSION
 Source10:       kodi.service
@@ -93,22 +68,10 @@
 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
-# Tumbleweed fully switched to libpcre2; build libpcre internally:
-Source26:       https://mirrors.kodi.tv/build-deps/sources/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
+# 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
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -121,14 +84,8 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Use the default compiler on Tumbleweed
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-%else
-BuildRequires:  gcc10
-BuildRequires:  gcc10-c++
-%endif
 BuildRequires:  ghostscript
 BuildRequires:  graphviz
 BuildRequires:  groff-full
@@ -161,10 +118,6 @@
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(sqlite3)
-%if 0%{?suse_version} < 1550
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libpcre)
-%endif
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
@@ -204,61 +157,14 @@
 BuildRequires:  pkgconfig(bluez)
 %endif
 BuildRequires:  libcap-devel
-%if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 60 with pkgconfig(libavcodec) < 61)
-BuildRequires:  (pkgconfig(libavfilter) >= 9 with pkgconfig(libavfilter) < 10)
-BuildRequires:  (pkgconfig(libavformat) >= 60 with pkgconfig(libavformat) < 61)
-BuildRequires:  (pkgconfig(libavutil) >= 58 with pkgconfig(libavutil) < 59)
-BuildRequires:  (pkgconfig(libpostproc) >= 57 with pkgconfig(libpostproc) < 58)
-BuildRequires:  (pkgconfig(libswresample) >= 4 with pkgconfig(libswresample) < 5)
-BuildRequires:  (pkgconfig(libswscale) >= 7 with pkgconfig(libswscale) < 8)
-%else
-BuildRequires:  ladspa-devel
-BuildRequires:  libgsm-devel
-BuildRequires:  pkg-config
-BuildRequires:  yasm
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(celt) >= 0.11.0
-BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi) >= 0.19.0
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdc1394-2)
-BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
-BuildRequires:  pkgconfig(libopenjpeg)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(schroedinger-1.0)
-BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vpx) >= 1.3.0
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shape)
-BuildRequires:  pkgconfig(xcb-shm)
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264)
-BuildRequires:  pkgconfig(x265)
-%endif
+
+BuildRequires:  pkgconfig(libavcodec) >= 62
+BuildRequires:  pkgconfig(libavfilter) >= 11
+BuildRequires:  pkgconfig(libavformat) >= 62
+BuildRequires:  pkgconfig(libavutil) >= 60
+BuildRequires:  pkgconfig(libswresample) >= 6
+BuildRequires:  pkgconfig(libswscale) >= 9
+
 BuildRequires:  swig < 4.2
 BuildRequires:  java-21
 BuildRequires:  apache-commons-lang3
@@ -277,7 +183,6 @@
 %endif
 %endif
 BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
 BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(wayland-scanner++)
@@ -286,7 +191,6 @@
 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
@@ -301,6 +205,7 @@
 Requires:       omxplayer
 %endif
 BuildRequires:  cmake
+BuildRequires:  meson >= 0.47.0
 BuildRequires:  gperf
 BuildRequires:  unzip
 BuildRequires:  zip
@@ -327,11 +232,16 @@
 BuildRequires: googletest-devel
 %endif
 
-%if %{without kodi_without_pipewire}
 # pipewire
 BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libspa-0.2)
-%endif
+
+# new deps
+BuildRequires: pkgconfig(exiv2)
+BuildRequires: pkgconfig(libpcre2-posix)
+BuildRequires: pkgconfig(libudfread)
+BuildRequires: pkgconfig(nlohmann_json)
+
 #
 %{?systemd_requires}
 
@@ -418,12 +328,6 @@
 mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
 rm -rf %{_builddir}/groovy/groovy-* || true
 
-%if 0%{?suse_version} > 1550
-# We build libpcre internally on Tumbleweed; pretend we also have a
-# debug libpcred.a:
-mkdir -p build/build/lib
-ln -sf libpcre.a build/build/lib/libpcred.a
-%endif
 %cmake \
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
@@ -431,18 +335,10 @@
 %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 \
-%if %{without sysffmpeg}
-    -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-%else
-    -DENABLE_INTERNAL_FFMPEG=OFF \
-%endif
     -DENABLE_INTERNAL_CDIO=OFF \
     -DENABLE_INTERNAL_SPDLOG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
@@ -452,8 +348,7 @@
     -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
     -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DENABLE_INTERNAL_UDFREAD=ON \
-    -DUDFREAD_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_UDFREAD=OFF \
     -Dgroovy_SOURCE_DIR=%{_builddir}/groovy \
     -Dapache-commons-lang_SOURCE_DIR=%{_datadir}/java \
     -Dapache-commons-text_SOURCE_DIR=%{_datadir}/java/apache-commons-text \
@@ -461,13 +356,7 @@
     -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 \
     -DPYTHON_VER=%{python_version} \
-%if %{with kodi_without_pipewire}
-    -DENABLE_PIPEWIRE=OFF \
-%endif
-%if 0%{?suse_version} > 1550
-    -DENABLE_INTERNAL_PCRE=ON \
-    -DPCRE_URL=%{SOURCE26} \
-%endif
+    -DENABLE_INTERNAL_PCRE=OFF \
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
@@ -478,12 +367,6 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
-# Tumbleweed does not have SuSEfirewall anymore:
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
-# SuSEfirewall service description
-install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
-
 # Systemd service file
 %if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
@@ -520,11 +403,6 @@
  --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
     rm -f %{buildroot}%{_bindir}/TexturePacker
@@ -548,9 +426,6 @@
 %files
 %defattr(-,root,root)
 %doc version.txt
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
@@ -560,10 +435,8 @@
 %{_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/*
@@ -674,6 +547,8 @@
 %{_kodi_addons_dir}/kodi.binary.instance.pvr/*
 %dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
 %{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.shaderpreset
+%{_kodi_addons_dir}/kodi.binary.instance.shaderpreset/*
 %dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
 %{_kodi_addons_dir}/kodi.binary.instance.vfs/*
 %dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec

0001-crossguid-dgb.patch Deleted

@@ -1,22 +0,0 @@
-diff -rup a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
---- a/cmake/modules/FindCrossGUID.cmake	2023-12-09 22:24:46.000000000 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2023-12-19 10:43:18.920305675 +0100
-@@ -14,7 +14,6 @@ macro(buildCrossGUID)
-   SETUP_BUILD_VARS()
- 
-   set(CROSSGUID_VERSION ${${MODULE}_VER})
--  set(CROSSGUID_DEBUG_POSTFIX "-dgb")
- 
-   set(_crossguid_definitions HAVE_NEW_CROSSGUID)
- 
-@@ -53,10 +52,6 @@ if(NOT TARGET CrossGUID::CrossGUID)
-                                            HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}
-                                            ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}
-                                            NO_CACHE)
--    find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb
--                                         HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}
--                                         ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}
--                                         NO_CACHE)
- 
-     # NEW_CROSSGUID >= 0.2.0 release
-     if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp")

0003-kodi-disable-wayland.patch Deleted

0004-kodi-workaround-pipewire-bug.patch Deleted

@@ -1,41 +0,0 @@
-diff -rup a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
---- a/tools/Linux/kodi.sh.in	2024-04-06 04:29:22.000000000 +0200
-+++ b/tools/Linux/kodi.sh.in	2024-04-22 17:58:07.556342563 +0200
-@@ -171,6 +171,7 @@ if command_exists gdb; then
-   fi
- fi
- 
-+ENV_ARGS=
- if  -n "${KODI_AE_SINK}" ; then
- 
-   echo "KODI_AE_SINK env variable is deprecated and will be removed in the future."
-@@ -189,6 +190,14 @@ if  -n "${KODI_AE_SINK}" ; then
-   elif  "${KODI_AE_SINK}" = "ALSA+PULSE" ; then
-     ENV_ARGS="--audio-backend=alsa+pulseaudio"
-   fi
-+else
-+  # Work around a possibly broken installation of pipewire on openSUSE Leap
-+  # see 'https://bugzilla.opensuse.org/show_bug.cgi?id=1222636'
-+  if  -x ${prefix}/bin/pulseaudio  &&
-+      -x ${prefix}/bin/pipewire  &&
-+      ! -x ${prefix}/bin/pipewire-pulse ; then
-+    ENV_ARGS="--audio-backend=pulseaudio"
-+  fi
- fi
- 
- if  -n "${KODI_GL_INTERFACE}" ; then
-@@ -197,11 +206,11 @@ if  -n "${KODI_GL_INTERFACE}" ; then
-   echo "Use the --gl-interface command line switch instead."
- 
-   if  "${KODI_GL_INTERFACE}" = "GLX" ; then
--    ENV_ARGS="--gl-interface=glx"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=glx"
-   elif  "${KODI_GL_INTERFACE}" = "EGL" ; then
--    ENV_ARGS="--gl-interface=egl"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=egl"
-   elif  "${KODI_GL_INTERFACE}" = "EGL_PB" ; then
--    ENV_ARGS="--gl-interface=egl-pb"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=egl-pb"
-   fi
- fi
-

_service:download_files:22.0b1-Piers.tar.gz Added

kodi.VERSION Changed

Changes of Revision 2