Request 6272 (accepted)

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

@@ -95,6 +95,8 @@
 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
@@ -160,8 +162,10 @@
 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
@@ -409,6 +413,12 @@
 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' \
@@ -449,6 +459,10 @@
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
+%if 0%{?suse_version} > 1550
+    -DENABLE_INTERNAL_PCRE=ON \
+    -DPCRE_URL=%{SOURCE26} \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi-noX-raspberry-pi2.spec Changed

@@ -95,6 +95,8 @@
 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
@@ -160,8 +162,10 @@
 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
@@ -409,6 +413,12 @@
 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' \
@@ -449,6 +459,10 @@
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
+%if 0%{?suse_version} > 1550
+    -DENABLE_INTERNAL_PCRE=ON \
+    -DPCRE_URL=%{SOURCE26} \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi-noX.spec Changed

@@ -95,6 +95,8 @@
 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
@@ -160,8 +162,10 @@
 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
@@ -409,6 +413,12 @@
 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' \
@@ -449,6 +459,10 @@
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
+%if 0%{?suse_version} > 1550
+    -DENABLE_INTERNAL_PCRE=ON \
+    -DPCRE_URL=%{SOURCE26} \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

kodi.spec Changed

@@ -95,6 +95,8 @@
 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
@@ -160,8 +162,10 @@
 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
@@ -409,6 +413,12 @@
 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' \
@@ -449,6 +459,10 @@
 %if %{with kodi_without_pipewire}
     -DENABLE_PIPEWIRE=OFF \
 %endif
+%if 0%{?suse_version} > 1550
+    -DENABLE_INTERNAL_PCRE=ON \
+    -DPCRE_URL=%{SOURCE26} \
+%endif
     ${NULL}
 
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l

Overview

Request 6272 (accepted)

Request History