Overview

Request 6272 (accepted)

- Tumbleweed fully switched to libpcre2; build libpcre internally.

Submit package home:manfred-h / kodi to package Multimedia / kodi
View file
kodi-noX-raspberry-pi.changes Changed
​x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Apr 25 09:02:35 UTC 2025 -  <manfred.h@gmx.net>
4
+
5
+- Tumbleweed fully switched to libpcre2; build libpcre internally.
6
+
7
+-------------------------------------------------------------------
8
 Thu Mar 13 10:18:13 UTC 2025 -  <manfred.h@gmx.net>
9
10
 - Add new define "python_version" to streamline all python related
11
​
View file
kodi-noX-raspberry-pi2.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Apr 25 09:02:35 UTC 2025 -  <manfred.h@gmx.net>
4
+
5
+- Tumbleweed fully switched to libpcre2; build libpcre internally.
6
+
7
+-------------------------------------------------------------------
8
 Thu Mar 13 10:18:13 UTC 2025 -  <manfred.h@gmx.net>
9
10
 - Add new define "python_version" to streamline all python related
11
​
View file
kodi-noX.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Apr 25 09:02:35 UTC 2025 -  <manfred.h@gmx.net>
4
+
5
+- Tumbleweed fully switched to libpcre2; build libpcre internally.
6
+
7
+-------------------------------------------------------------------
8
 Thu Mar 13 10:18:13 UTC 2025 -  <manfred.h@gmx.net>
9
10
 - Add new define "python_version" to streamline all python related
11
​
View file
kodi.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Apr 25 09:02:35 UTC 2025 -  <manfred.h@gmx.net>
4
+
5
+- Tumbleweed fully switched to libpcre2; build libpcre internally.
6
+
7
+-------------------------------------------------------------------
8
 Thu Mar 13 10:18:13 UTC 2025 -  <manfred.h@gmx.net>
9
10
 - Add new define "python_version" to streamline all python related
11
​
View file
kodi-noX-raspberry-pi.spec Changed
45
 
1
@@ -95,6 +95,8 @@
2
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
3
 Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
4
 Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
5
+# Tumbleweed fully switched to libpcre2; build libpcre internally:
6
+Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
7
8
 ## %if 0%{without sysffmpeg}
9
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
10
@@ -160,8 +162,10 @@
11
 BuildRequires:  pkgconfig(libxslt)
12
 BuildRequires:  pkgconfig(fribidi)
13
 BuildRequires:  pkgconfig(sqlite3)
14
+%if 0%{?suse_version} < 1550
15
 BuildRequires:  pkgconfig(libpcrecpp)
16
 BuildRequires:  pkgconfig(libpcre)
17
+%endif
18
 BuildRequires:  pkgconfig(freetype2)
19
 BuildRequires:  pkgconfig(taglib) >= 1.9
20
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
21
@@ -409,6 +413,12 @@
22
 mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
23
 rm -rf %{_builddir}/groovy/groovy-* || true
24
25
+%if 0%{?suse_version} > 1550
26
+# We build libpcre internally on Tumbleweed; pretend we also have a
27
+# debug libpcred.a:
28
+mkdir -p build/build/lib
29
+ln -sf libpcre.a build/build/lib/libpcred.a
30
+%endif
31
 %cmake \
32
 %ifarch i586
33
     -DCMAKE_C_FLAGS='-msse' \
34
@@ -449,6 +459,10 @@
35
 %if %{with kodi_without_pipewire}
36
     -DENABLE_PIPEWIRE=OFF \
37
 %endif
38
+%if 0%{?suse_version} > 1550
39
+    -DENABLE_INTERNAL_PCRE=ON \
40
+    -DPCRE_URL=%{SOURCE26} \
41
+%endif
42
     ${NULL}
43
44
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
45
​
View file
kodi-noX-raspberry-pi2.spec Changed
45
 
1
@@ -95,6 +95,8 @@
2
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
3
 Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
4
 Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
5
+# Tumbleweed fully switched to libpcre2; build libpcre internally:
6
+Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
7
8
 ## %if 0%{without sysffmpeg}
9
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
10
@@ -160,8 +162,10 @@
11
 BuildRequires:  pkgconfig(libxslt)
12
 BuildRequires:  pkgconfig(fribidi)
13
 BuildRequires:  pkgconfig(sqlite3)
14
+%if 0%{?suse_version} < 1550
15
 BuildRequires:  pkgconfig(libpcrecpp)
16
 BuildRequires:  pkgconfig(libpcre)
17
+%endif
18
 BuildRequires:  pkgconfig(freetype2)
19
 BuildRequires:  pkgconfig(taglib) >= 1.9
20
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
21
@@ -409,6 +413,12 @@
22
 mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
23
 rm -rf %{_builddir}/groovy/groovy-* || true
24
25
+%if 0%{?suse_version} > 1550
26
+# We build libpcre internally on Tumbleweed; pretend we also have a
27
+# debug libpcred.a:
28
+mkdir -p build/build/lib
29
+ln -sf libpcre.a build/build/lib/libpcred.a
30
+%endif
31
 %cmake \
32
 %ifarch i586
33
     -DCMAKE_C_FLAGS='-msse' \
34
@@ -449,6 +459,10 @@
35
 %if %{with kodi_without_pipewire}
36
     -DENABLE_PIPEWIRE=OFF \
37
 %endif
38
+%if 0%{?suse_version} > 1550
39
+    -DENABLE_INTERNAL_PCRE=ON \
40
+    -DPCRE_URL=%{SOURCE26} \
41
+%endif
42
     ${NULL}
43
44
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
45
​
View file
kodi-noX.spec Changed
45
 
1
@@ -95,6 +95,8 @@
2
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
3
 Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
4
 Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
5
+# Tumbleweed fully switched to libpcre2; build libpcre internally:
6
+Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
7
8
 ## %if 0%{without sysffmpeg}
9
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
10
@@ -160,8 +162,10 @@
11
 BuildRequires:  pkgconfig(libxslt)
12
 BuildRequires:  pkgconfig(fribidi)
13
 BuildRequires:  pkgconfig(sqlite3)
14
+%if 0%{?suse_version} < 1550
15
 BuildRequires:  pkgconfig(libpcrecpp)
16
 BuildRequires:  pkgconfig(libpcre)
17
+%endif
18
 BuildRequires:  pkgconfig(freetype2)
19
 BuildRequires:  pkgconfig(taglib) >= 1.9
20
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
21
@@ -409,6 +413,12 @@
22
 mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
23
 rm -rf %{_builddir}/groovy/groovy-* || true
24
25
+%if 0%{?suse_version} > 1550
26
+# We build libpcre internally on Tumbleweed; pretend we also have a
27
+# debug libpcred.a:
28
+mkdir -p build/build/lib
29
+ln -sf libpcre.a build/build/lib/libpcred.a
30
+%endif
31
 %cmake \
32
 %ifarch i586
33
     -DCMAKE_C_FLAGS='-msse' \
34
@@ -449,6 +459,10 @@
35
 %if %{with kodi_without_pipewire}
36
     -DENABLE_PIPEWIRE=OFF \
37
 %endif
38
+%if 0%{?suse_version} > 1550
39
+    -DENABLE_INTERNAL_PCRE=ON \
40
+    -DPCRE_URL=%{SOURCE26} \
41
+%endif
42
     ${NULL}
43
44
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
45
​
View file
kodi.spec Changed
45
 
1
@@ -95,6 +95,8 @@
2
 Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
3
 Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
4
 Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
5
+# Tumbleweed fully switched to libpcre2; build libpcre internally:
6
+Source26:       https://mirrors.kodi.tv/build-deps/sources/pcre-8.45.tar.bz2
7
8
 ## %if 0%{without sysffmpeg}
9
 ## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
10
@@ -160,8 +162,10 @@
11
 BuildRequires:  pkgconfig(libxslt)
12
 BuildRequires:  pkgconfig(fribidi)
13
 BuildRequires:  pkgconfig(sqlite3)
14
+%if 0%{?suse_version} < 1550
15
 BuildRequires:  pkgconfig(libpcrecpp)
16
 BuildRequires:  pkgconfig(libpcre)
17
+%endif
18
 BuildRequires:  pkgconfig(freetype2)
19
 BuildRequires:  pkgconfig(taglib) >= 1.9
20
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
21
@@ -409,6 +413,12 @@
22
 mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
23
 rm -rf %{_builddir}/groovy/groovy-* || true
24
25
+%if 0%{?suse_version} > 1550
26
+# We build libpcre internally on Tumbleweed; pretend we also have a
27
+# debug libpcred.a:
28
+mkdir -p build/build/lib
29
+ln -sf libpcre.a build/build/lib/libpcred.a
30
+%endif
31
 %cmake \
32
 %ifarch i586
33
     -DCMAKE_C_FLAGS='-msse' \
34
@@ -449,6 +459,10 @@
35
 %if %{with kodi_without_pipewire}
36
     -DENABLE_PIPEWIRE=OFF \
37
 %endif
38
+%if 0%{?suse_version} > 1550
39
+    -DENABLE_INTERNAL_PCRE=ON \
40
+    -DPCRE_URL=%{SOURCE26} \
41
+%endif
42
     ${NULL}
43
44
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
45
​
Refresh
Refresh
Request History
manfred-h's avatar

manfred-h created request 4 months ago

- Tumbleweed fully switched to libpcre2; build libpcre internally.

manfred-h's avatar

manfred-h accepted request 4 months ago

Locations
Help
Contact