Overview

Request 5352 (accepted)

No description set
Submit package home:sagiben / kodi to package Multimedia / kodi
View file
kodi-noX-raspberry-pi.changes Changed
​x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Version update to Kodi 19.0 Matrix
6
+
7
+-------------------------------------------------------------------
8
 Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
9
10
 - SSE does not depend on buildhost
11
​
View file
kodi-noX-raspberry-pi2.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Version update to Kodi 19.0 Matrix
6
+
7
+-------------------------------------------------------------------
8
 Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
9
10
 - SSE does not depend on buildhost
11
​
View file
kodi-noX.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Version update to Kodi 19.0 Matrix
6
+
7
+-------------------------------------------------------------------
8
 Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
9
10
 - SSE does not depend on buildhost
11
​
View file
kodi.changes Changed
11
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Version update to Kodi 19.0 Matrix
6
+
7
+-------------------------------------------------------------------
8
 Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
9
10
 - SSE does not depend on buildhost
11
​
View file
kodi-noX-raspberry-pi.spec Changed
423
 
1
@@ -18,15 +18,18 @@
2
3
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
4
 # kodi.* files with the pre_checkin.sh script
5
-%define kodi_version Leia
6
-%define ffmpeg_version 4.0.3-Leia-RC5
7
+%define kodi_version Matrix
8
+%define ffmpeg_version 4.3.1-Matrix-Beta1
9
 %define _kodi_addons_dir %{_datadir}/kodi/addons
10
 # set this parameter to enable building Kodi with ccache, debug information, etc.
11
-%define dev_build 1
12
+%define dev_build 0
13
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
14
 %bcond_without sysffmpeg
15
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
16
 %bcond_with kodi_with_X11
17
+# Enable or disable Wayland depending on whether the stack is usable or not:
18
+%bcond_with kodi_with_wayland
19
+
20
 %define kodi_platform raspberry-pi
21
 %define kodi_player omxplayer
22
23
@@ -46,7 +49,7 @@
24
 ExclusiveArch: does-not-build
25
26
 Name:           kodi-noX-raspberry-pi
27
-Version:        18.9
28
+Version:        19.0
29
 Release:        0
30
 Summary:        Media center (formerly known as XBMC)
31
 License:        GPL-2.0+ and GPL-3.0+
32
@@ -64,10 +67,10 @@
33
 Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
34
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
35
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
36
-%if %{without sysffmpeg}
37
+## if %{without sysffmpeg}
38
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
39
-%endif
40
-Patch0:         kodi-sse.patch
41
+## endif
42
+#Patch0:         kodi-sse.patch
43
 #Patch0:         kodi.arm.patch
44
 #Patch1:         no-xbmc-symbolic-link.patch
45
 #Patch2:         kodi-texturepacker.patch
46
@@ -77,9 +80,13 @@
47
 Patch6:         kodi-install.patch
48
 Patch7:         kodi-apply-dvdrun.patch
49
 Patch8:            kodi-libdrm.patch
50
+%if %{without kodi_with_wayland}
51
+Patch9:         kodi-disable-wayland.patch
52
+%endif
53
54
 BuildRequires:  autoconf
55
 BuildRequires:  automake
56
+BuildRequires:  binutils-gold
57
 BuildRequires:  desktop-file-utils
58
 BuildRequires:  fdupes
59
 BuildRequires:  gawk
60
@@ -91,6 +98,7 @@
61
 BuildRequires:  gcc8-c++
62
 %endif
63
 BuildRequires:  ghostscript
64
+BuildRequires:  graphviz
65
 BuildRequires:  groff-full
66
 BuildRequires:  libtool
67
 BuildRequires:  pkg-config
68
@@ -98,7 +106,7 @@
69
 BuildRequires:  fstrcmp-devel
70
 BuildRequires:  pkgconfig(fmt)
71
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
72
-BuildRequires:  pkgconfig(python2)
73
+BuildRequires:  pkgconfig(python3)
74
 BuildRequires:  libmysqlclient-devel
75
 BuildRequires:  pkgconfig(libass)
76
 BuildRequires:  pkgconfig(libcurl)
77
@@ -113,6 +121,7 @@
78
 BuildRequires:  pkgconfig(uuid)
79
 BuildRequires:  libyajl-devel >= 2
80
 BuildRequires:  pkgconfig(libidn2)
81
+BuildRequires:  pkgconfig(libinput)
82
 BuildRequires:  pkgconfig(libxml-2.0)
83
 BuildRequires:  pkgconfig(libxslt)
84
 BuildRequires:  pkgconfig(fribidi)
85
@@ -121,8 +130,9 @@
86
 BuildRequires:  pkgconfig(libpcre)
87
 BuildRequires:  pkgconfig(freetype2)
88
 BuildRequires:  pkgconfig(taglib) >= 1.9
89
-BuildRequires:  pkgconfig(libcdio)
90
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
91
 BuildRequires:  pkgconfig(lirc)
92
+BuildRequires:  pkgconfig(RapidJSON)
93
 %if %{with kodi_libbluray}
94
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
95
 %endif
96
@@ -132,17 +142,23 @@
97
 BuildRequires:  pkgconfig(libmicrohttpd)
98
 BuildRequires:  pkgconfig(libpulse) >= 1.0
99
 BuildRequires:  pkgconfig(avahi-client)
100
+BuildRequires:  pkgconfig(gbm)
101
 %if %{with kodi_with_X11}
102
 BuildRequires:  pkgconfig(x11)
103
 BuildRequires:  pkgconfig(xext)
104
 BuildRequires:  pkgconfig(xrandr)
105
 BuildRequires:  pkgconfig(libdrm)
106
 BuildRequires:  pkgconfig(egl)
107
+BuildRequires:  pkgconfig(xkbcommon)
108
 %endif
109
 BuildRequires:  pkgconfig(libssh)
110
 BuildRequires:  pkgconfig(smbclient)
111
 BuildRequires:  pkgconfig(libnfs)
112
+%if 0%{?suse_version} >= 1550
113
+BuildRequires:  pkgconfig(libplist-2.0)
114
+%else
115
 BuildRequires:  pkgconfig(libplist)
116
+%endif
117
 BuildRequires:  shairplay-devel
118
 BuildRequires:  pkgconfig(libudev)
119
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
120
@@ -175,7 +191,6 @@
121
 BuildRequires:  pkgconfig(jack)
122
 BuildRequires:  pkgconfig(libass)
123
 BuildRequires:  pkgconfig(libbluray)
124
-BuildRequires:  pkgconfig(libcdio)
125
 BuildRequires:  pkgconfig(libcdio_paranoia)
126
 BuildRequires:  pkgconfig(libdc1394-2)
127
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
128
@@ -223,6 +238,15 @@
129
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
130
 %endif
131
 %endif
132
+%if %{with kodi_with_wayland}
133
+BuildRequires:  pkgconfig(libva-wayland)
134
+BuildRequires:  pkgconfig(wayland-scanner)
135
+BuildRequires:  pkgconfig(wayland-protocols)
136
+BuildRequires:  pkgconfig(wayland-client)
137
+BuildRequires:  pkgconfig(wayland-client++)
138
+BuildRequires:  pkgconfig(wayland-cursor++)
139
+BuildRequires:  pkgconfig(wayland-egl++)
140
+%endif
141
 %if %{with enable_opengles}
142
 %if "%{kodi_platform}" == "none"
143
 BuildRequires:  Mesa-libEGL-devel
144
@@ -240,9 +264,7 @@
145
 BuildRequires:  gperf
146
 BuildRequires:  unzip
147
 BuildRequires:  zip
148
-%ifarch %ix86
149
 BuildRequires:  nasm
150
-%endif
151
 %if %{dev_build}
152
 BuildRequires:  ccache
153
 %endif
154
@@ -256,6 +278,15 @@
155
 BuildRequires:  libjpeg8-devel
156
 BuildRequires:  lzo-devel
157
 #
158
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
159
+BuildRequires:  libunistring-devel
160
+
161
+%if 0%{?suse_version} > 1510
162
+BuildRequires:  pkgconfig(gtest)
163
+%else
164
+BuildRequires: googletest-devel
165
+%endif
166
+#
167
 %{?systemd_requires}
168
169
 # kodi needs libnfs to access nfs sources, it is not automatically required
170
@@ -263,6 +294,7 @@
171
 #
172
 Obsoletes:      xbmc < %{version}
173
 Provides:       xbmc = %{version}
174
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
175
 %if %{with kodi_with_X11}
176
 Conflicts:      kodi
177
 %else
178
@@ -291,7 +323,21 @@
179
 Development files for Kodi Media Center
180
181
 %prep
182
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
183
+%setup -q -n xbmc-%{version}-%{kodi_version}
184
+#%setup -q -n xbmc-%{version}
185
+
186
+#%patch0
187
+#%patch1
188
+#%patch2
189
+#%patch3
190
+#%patch4
191
+#%patch5
192
+%patch6
193
+%patch7
194
+#%patch8 -p1
195
+%if %{without kodi_with_wayland}
196
+%patch9
197
+%endif
198
199
 %build
200
201
@@ -335,17 +381,29 @@
202
     -DCMAKE_C_COMPILER=$CC \
203
     -DCMAKE_CXX_COMPILER=$CXX \
204
     -DENABLE_INTERNAL_FMT=OFF \
205
-    -DENABLE_INTERNAL_RapidJSON=OFF \
206
-    -DFFMPEG_URL=%{SOURCE30} \
207
     -DENABLE_INTERNAL_FFMPEG=OFF \
208
+    -DFFMPEG_URL=%{SOURCE30} \
209
+    -DENABLE_INTERNAL_CDIO=OFF \
210
+    -DENABLE_INTERNAL_SPDLOG=OFF \
211
     -DCROSSGUID_URL=%{SOURCE20} \
212
     -DLIBDVDNAV_URL=%{SOURCE21} \
213
     -DLIBDVDCSS_URL=%{SOURCE22} \
214
     -DLIBDVDREAD_URL=%{SOURCE23} \
215
+    -DENABLE_INTERNAL_RapidJSON=OFF \
216
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
217
     -DENABLE_INTERNAL_FSTRCMP=OFF \
218
-    -DBUILD_SHARED_LIBS=1
219
-
220
+    -DAPP_RENDER_SYSTEM=gl \
221
+    -DX11_RENDER_SYSTEM=gl \
222
+    -DBUILD_SHARED_LIBS=1 \
223
+    ${NULL}
224
+
225
+    #-DRapidJSON_URL=%{SOURCE25}
226
+    #-DENABLE_INTERNAL_RapidJSON=ON
227
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
228
+    #-DFLATBUFFERS_URL=%{SOURCE26}
229
+    #-DENABLE_INTERNAL_FSTRCMP=ON
230
+    #-DFSTRCMP_URL=%{SOURCE27}
231
+
232
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
233
234
 %install
235
@@ -353,8 +411,11 @@
236
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
237
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
238
239
+# Tumbleweed does not have SuSEfirewall anymore:
240
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
241
 # SuSEfirewall service description
242
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
243
+%endif
244
245
 # Systemd service file
246
 %if %{without kodi_with_X11}
247
@@ -407,15 +468,19 @@
248
 %service_del_postun kodi.service
249
250
 %files
251
+%defattr(-,root,root)
252
 %doc version.txt
253
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
254
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
255
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
256
+%endif
257
 %{_bindir}/kodi
258
 %{_bindir}/kodi-standalone
259
 %{_bindir}/TexturePacker
260
+%{_bindir}/JsonSchemaBuilder
261
 %dir %{_libdir}/kodi
262
 %if %{with kodi_with_X11}
263
 %{_libdir}/kodi/kodi-xrandr
264
-%{_libdir}/kodi/kodi-x11
265
+%{_libdir}/kodi/kodi.bin
266
 %endif
267
 %{_datadir}/xsessions/kodi.desktop
268
 %{_datadir}/applications/kodi.desktop
269
@@ -457,8 +522,12 @@
270
 %{_kodi_addons_dir}/metadata.local/*
271
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
272
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
273
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
274
+%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
275
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
276
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
277
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
278
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
279
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
280
 %{_kodi_addons_dir}/repository.xbmc.org/*
281
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
282
@@ -537,6 +606,12 @@
283
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
284
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
285
 %{_kodi_addons_dir}/script.module.pycryptodome/*
286
+%dir %{_kodi_addons_dir}/metadata.generic.albums
287
+%{_kodi_addons_dir}/metadata.generic.albums/*
288
+%dir %{_kodi_addons_dir}/metadata.generic.artists
289
+%{_kodi_addons_dir}/metadata.generic.artists/*
290
+%dir %{_kodi_addons_dir}/kodi.binary.global.tools
291
+%{_kodi_addons_dir}/kodi.binary.global.tools/*
292
 %dir %{_libdir}/firewalld
293
 %dir %{_libdir}/firewalld/services
294
 %{_libdir}/firewalld/services/kodi-eventserver.xml
295
@@ -566,76 +641,63 @@
296
297
298
 %files devel
299
+%defattr(-,root,root)
300
 %dir %{_includedir}/kodi
301
-%{_includedir}/kodi/xbmc_epg_types.h
302
-%{_includedir}/kodi/xbmc_addon_dll.h
303
-%{_includedir}/kodi/xbmc_addon_types.h
304
 %dir %{_includedir}/kodi/tools
305
 %{_includedir}/kodi/tools/DllHelper.h
306
-%{_includedir}/kodi/Filesystem.h
307
-%{_includedir}/kodi/Network.h
308
-%{_includedir}/kodi/libXBMC_pvr.h
309
-%{_includedir}/kodi/libKODI_guilib.h
310
-%{_includedir}/kodi/libKODI_game.h
311
-%{_includedir}/kodi/kodi_game_dll.h
312
 %{_includedir}/kodi/AddonBase.h
313
-%{_includedir}/kodi/kodi_vfs_types.h
314
-%{_includedir}/kodi/StreamCrypto.h
315
-%{_includedir}/kodi/kodi_game_types.h
316
+%{_includedir}/kodi/AudioEngine.h
317
+%{_includedir}/kodi/Filesystem.h
318
 %{_includedir}/kodi/General.h
319
-%dir %{_includedir}/kodi/platform
320
-%dir %{_includedir}/kodi/platform/android
321
-%{_includedir}/kodi/platform/android/System.h
322
-%dir %{_includedir}/kodi/addon-instance
323
-%{_includedir}/kodi/addon-instance/VideoCodec.h
324
-%{_includedir}/kodi/addon-instance/Peripheral.h
325
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
326
-%{_includedir}/kodi/addon-instance/Visualization.h
327
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
328
-%{_includedir}/kodi/addon-instance/VFS.h
329
-%{_includedir}/kodi/addon-instance/Inputstream.h
330
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
331
-%{_includedir}/kodi/addon-instance/Screensaver.h
332
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
333
-%{_includedir}/kodi/libXBMC_addon.h
334
+%{_includedir}/kodi/Network.h
335
 %{_includedir}/kodi/versions.h
336
-%{_includedir}/kodi/xbmc_pvr_dll.h
337
-%{_includedir}/kodi/xbmc_pvr_types.h
338
-%{_includedir}/kodi/StreamCodec.h
339
+%dir %{_includedir}/kodi/addon-instance
340
+%{_includedir}/kodi/addon-instance/*
341
+%dir %{_includedir}/kodi/addon-instance/inputstream
342
+%{_includedir}/kodi/addon-instance/inputstream/*
343
+%dir %{_includedir}/kodi/addon-instance/peripheral
344
+%{_includedir}/kodi/addon-instance/peripheral/*
345
+%dir %{_includedir}/kodi/addon-instance/pvr
346
+%{_includedir}/kodi/addon-instance/pvr/*
347
+%dir %{_includedir}/kodi/c-api
348
+%{_includedir}/kodi/c-api/*
349
+%dir %{_includedir}/kodi/c-api/addon-instance
350
+%{_includedir}/kodi/c-api/addon-instance/*
351
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
352
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
353
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
354
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
355
+%dir %{_includedir}/kodi/c-api/gui
356
+%{_includedir}/kodi/c-api/gui/*
357
+%dir %{_includedir}/kodi/c-api/gui/controls
358
+%{_includedir}/kodi/c-api/gui/controls/*
359
+%dir %{_includedir}/kodi/c-api/gui/dialogs
360
+%{_includedir}/kodi/c-api/gui/dialogs/*
361
+%dir %{_includedir}/kodi/c-api/gui/input
362
+%{_includedir}/kodi/c-api/gui/input/*
363
+%dir %{_includedir}/kodi/c-api/platform
364
+%dir %{_includedir}/kodi/c-api/platform/android
365
+%{_includedir}/kodi/c-api/platform/android/*
366
 %dir %{_includedir}/kodi/gui
367
-%{_includedir}/kodi/gui/definitions.h
368
-%{_includedir}/kodi/gui/Window.h
369
-%{_includedir}/kodi/gui/General.h
370
-%{_includedir}/kodi/gui/ListItem.h
371
-%dir %{_includedir}/kodi/gui/dialogs
372
-%{_includedir}/kodi/gui/dialogs/Select.h
373
-%{_includedir}/kodi/gui/dialogs/OK.h
374
-%{_includedir}/kodi/gui/dialogs/YesNo.h
375
-%{_includedir}/kodi/gui/dialogs/Numeric.h
376
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
377
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
378
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
379
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
380
-%{_includedir}/kodi/gui/dialogs/Progress.h
381
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
382
+%{_includedir}/kodi/gui/*
383
 %dir %{_includedir}/kodi/gui/controls
384
-%{_includedir}/kodi/gui/controls/FadeLabel.h
385
-%{_includedir}/kodi/gui/controls/Edit.h
386
-%{_includedir}/kodi/gui/controls/TextBox.h
387
-%{_includedir}/kodi/gui/controls/Progress.h
388
-%{_includedir}/kodi/gui/controls/Rendering.h
389
-%{_includedir}/kodi/gui/controls/Slider.h
390
-%{_includedir}/kodi/gui/controls/Image.h
391
-%{_includedir}/kodi/gui/controls/Label.h
392
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
393
-%{_includedir}/kodi/gui/controls/RadioButton.h
394
-%{_includedir}/kodi/gui/controls/Button.h
395
-%{_includedir}/kodi/gui/controls/Spin.h
396
-%{_includedir}/kodi/DemuxCrypto.h
397
-%{_includedir}/kodi/DemuxPacket.h
398
-%{_includedir}/kodi/TimingConstants.h
399
-%{_includedir}/kodi/AEChannelData.h
400
-%{_includedir}/kodi/IFileTypes.h
401
-%{_includedir}/kodi/ActionIDs.h
402
-%{_includedir}/kodi/XBMC_vkeys.h
403
+%{_includedir}/kodi/gui/controls/*
404
+%dir %{_includedir}/kodi/gui/dialogs
405
+%{_includedir}/kodi/gui/dialogs/*
406
+%dir %{_includedir}/kodi/gui/gl
407
+%{_includedir}/kodi/gui/gl/*
408
+%dir %{_includedir}/kodi/gui/input
409
+%{_includedir}/kodi/gui/input/*
410
+%dir %{_includedir}/kodi/platform
411
+%dir %{_includedir}/kodi/platform/android
412
+%{_includedir}/kodi/platform/android/System.h
413
+%dir %{_includedir}/kodi/tools
414
+%{_includedir}/kodi/tools/*
415
+# %{_includedir}/kodi/AEChannelData.h
416
+# %{_includedir}/kodi/DemuxCrypto.h
417
+# %{_includedir}/kodi/DemuxPacket.h
418
+# %{_includedir}/kodi/InputStreamConstants.h
419
+# %{_includedir}/kodi/TimingConstants.h
420
+# %{_includedir}/kodi/XBMC_vkeys.h
421
+
422
 %changelog
423
​
View file
kodi-noX-raspberry-pi2.spec Changed
423
 
1
@@ -18,15 +18,18 @@
2
3
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
4
 # kodi.* files with the pre_checkin.sh script
5
-%define kodi_version Leia
6
-%define ffmpeg_version 4.0.3-Leia-RC5
7
+%define kodi_version Matrix
8
+%define ffmpeg_version 4.3.1-Matrix-Beta1
9
 %define _kodi_addons_dir %{_datadir}/kodi/addons
10
 # set this parameter to enable building Kodi with ccache, debug information, etc.
11
-%define dev_build 1
12
+%define dev_build 0
13
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
14
 %bcond_without sysffmpeg
15
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
16
 %bcond_with kodi_with_X11
17
+# Enable or disable Wayland depending on whether the stack is usable or not:
18
+%bcond_with kodi_with_wayland
19
+
20
 %define kodi_platform raspberry-pi2
21
 %define kodi_player omxplayer
22
23
@@ -46,7 +49,7 @@
24
 ExclusiveArch: does-not-build
25
26
 Name:           kodi-noX-raspberry-pi2
27
-Version:        18.9
28
+Version:        19.0
29
 Release:        0
30
 Summary:        Media center (formerly known as XBMC)
31
 License:        GPL-2.0+ and GPL-3.0+
32
@@ -64,10 +67,10 @@
33
 Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
34
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
35
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
36
-%if %{without sysffmpeg}
37
+## if %{without sysffmpeg}
38
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
39
-%endif
40
-Patch0:         kodi-sse.patch
41
+## endif
42
+#Patch0:         kodi-sse.patch
43
 #Patch0:         kodi.arm.patch
44
 #Patch1:         no-xbmc-symbolic-link.patch
45
 #Patch2:         kodi-texturepacker.patch
46
@@ -77,9 +80,13 @@
47
 Patch6:         kodi-install.patch
48
 Patch7:         kodi-apply-dvdrun.patch
49
 Patch8:            kodi-libdrm.patch
50
+%if %{without kodi_with_wayland}
51
+Patch9:         kodi-disable-wayland.patch
52
+%endif
53
54
 BuildRequires:  autoconf
55
 BuildRequires:  automake
56
+BuildRequires:  binutils-gold
57
 BuildRequires:  desktop-file-utils
58
 BuildRequires:  fdupes
59
 BuildRequires:  gawk
60
@@ -91,6 +98,7 @@
61
 BuildRequires:  gcc8-c++
62
 %endif
63
 BuildRequires:  ghostscript
64
+BuildRequires:  graphviz
65
 BuildRequires:  groff-full
66
 BuildRequires:  libtool
67
 BuildRequires:  pkg-config
68
@@ -98,7 +106,7 @@
69
 BuildRequires:  fstrcmp-devel
70
 BuildRequires:  pkgconfig(fmt)
71
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
72
-BuildRequires:  pkgconfig(python2)
73
+BuildRequires:  pkgconfig(python3)
74
 BuildRequires:  libmysqlclient-devel
75
 BuildRequires:  pkgconfig(libass)
76
 BuildRequires:  pkgconfig(libcurl)
77
@@ -113,6 +121,7 @@
78
 BuildRequires:  pkgconfig(uuid)
79
 BuildRequires:  libyajl-devel >= 2
80
 BuildRequires:  pkgconfig(libidn2)
81
+BuildRequires:  pkgconfig(libinput)
82
 BuildRequires:  pkgconfig(libxml-2.0)
83
 BuildRequires:  pkgconfig(libxslt)
84
 BuildRequires:  pkgconfig(fribidi)
85
@@ -121,8 +130,9 @@
86
 BuildRequires:  pkgconfig(libpcre)
87
 BuildRequires:  pkgconfig(freetype2)
88
 BuildRequires:  pkgconfig(taglib) >= 1.9
89
-BuildRequires:  pkgconfig(libcdio)
90
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
91
 BuildRequires:  pkgconfig(lirc)
92
+BuildRequires:  pkgconfig(RapidJSON)
93
 %if %{with kodi_libbluray}
94
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
95
 %endif
96
@@ -132,17 +142,23 @@
97
 BuildRequires:  pkgconfig(libmicrohttpd)
98
 BuildRequires:  pkgconfig(libpulse) >= 1.0
99
 BuildRequires:  pkgconfig(avahi-client)
100
+BuildRequires:  pkgconfig(gbm)
101
 %if %{with kodi_with_X11}
102
 BuildRequires:  pkgconfig(x11)
103
 BuildRequires:  pkgconfig(xext)
104
 BuildRequires:  pkgconfig(xrandr)
105
 BuildRequires:  pkgconfig(libdrm)
106
 BuildRequires:  pkgconfig(egl)
107
+BuildRequires:  pkgconfig(xkbcommon)
108
 %endif
109
 BuildRequires:  pkgconfig(libssh)
110
 BuildRequires:  pkgconfig(smbclient)
111
 BuildRequires:  pkgconfig(libnfs)
112
+%if 0%{?suse_version} >= 1550
113
+BuildRequires:  pkgconfig(libplist-2.0)
114
+%else
115
 BuildRequires:  pkgconfig(libplist)
116
+%endif
117
 BuildRequires:  shairplay-devel
118
 BuildRequires:  pkgconfig(libudev)
119
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
120
@@ -175,7 +191,6 @@
121
 BuildRequires:  pkgconfig(jack)
122
 BuildRequires:  pkgconfig(libass)
123
 BuildRequires:  pkgconfig(libbluray)
124
-BuildRequires:  pkgconfig(libcdio)
125
 BuildRequires:  pkgconfig(libcdio_paranoia)
126
 BuildRequires:  pkgconfig(libdc1394-2)
127
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
128
@@ -223,6 +238,15 @@
129
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
130
 %endif
131
 %endif
132
+%if %{with kodi_with_wayland}
133
+BuildRequires:  pkgconfig(libva-wayland)
134
+BuildRequires:  pkgconfig(wayland-scanner)
135
+BuildRequires:  pkgconfig(wayland-protocols)
136
+BuildRequires:  pkgconfig(wayland-client)
137
+BuildRequires:  pkgconfig(wayland-client++)
138
+BuildRequires:  pkgconfig(wayland-cursor++)
139
+BuildRequires:  pkgconfig(wayland-egl++)
140
+%endif
141
 %if %{with enable_opengles}
142
 %if "%{kodi_platform}" == "none"
143
 BuildRequires:  Mesa-libEGL-devel
144
@@ -240,9 +264,7 @@
145
 BuildRequires:  gperf
146
 BuildRequires:  unzip
147
 BuildRequires:  zip
148
-%ifarch %ix86
149
 BuildRequires:  nasm
150
-%endif
151
 %if %{dev_build}
152
 BuildRequires:  ccache
153
 %endif
154
@@ -256,6 +278,15 @@
155
 BuildRequires:  libjpeg8-devel
156
 BuildRequires:  lzo-devel
157
 #
158
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
159
+BuildRequires:  libunistring-devel
160
+
161
+%if 0%{?suse_version} > 1510
162
+BuildRequires:  pkgconfig(gtest)
163
+%else
164
+BuildRequires: googletest-devel
165
+%endif
166
+#
167
 %{?systemd_requires}
168
169
 # kodi needs libnfs to access nfs sources, it is not automatically required
170
@@ -263,6 +294,7 @@
171
 #
172
 Obsoletes:      xbmc < %{version}
173
 Provides:       xbmc = %{version}
174
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
175
 %if %{with kodi_with_X11}
176
 Conflicts:      kodi
177
 %else
178
@@ -291,7 +323,21 @@
179
 Development files for Kodi Media Center
180
181
 %prep
182
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
183
+%setup -q -n xbmc-%{version}-%{kodi_version}
184
+#%setup -q -n xbmc-%{version}
185
+
186
+#%patch0
187
+#%patch1
188
+#%patch2
189
+#%patch3
190
+#%patch4
191
+#%patch5
192
+%patch6
193
+%patch7
194
+#%patch8 -p1
195
+%if %{without kodi_with_wayland}
196
+%patch9
197
+%endif
198
199
 %build
200
201
@@ -335,17 +381,29 @@
202
     -DCMAKE_C_COMPILER=$CC \
203
     -DCMAKE_CXX_COMPILER=$CXX \
204
     -DENABLE_INTERNAL_FMT=OFF \
205
-    -DENABLE_INTERNAL_RapidJSON=OFF \
206
-    -DFFMPEG_URL=%{SOURCE30} \
207
     -DENABLE_INTERNAL_FFMPEG=OFF \
208
+    -DFFMPEG_URL=%{SOURCE30} \
209
+    -DENABLE_INTERNAL_CDIO=OFF \
210
+    -DENABLE_INTERNAL_SPDLOG=OFF \
211
     -DCROSSGUID_URL=%{SOURCE20} \
212
     -DLIBDVDNAV_URL=%{SOURCE21} \
213
     -DLIBDVDCSS_URL=%{SOURCE22} \
214
     -DLIBDVDREAD_URL=%{SOURCE23} \
215
+    -DENABLE_INTERNAL_RapidJSON=OFF \
216
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
217
     -DENABLE_INTERNAL_FSTRCMP=OFF \
218
-    -DBUILD_SHARED_LIBS=1
219
-
220
+    -DAPP_RENDER_SYSTEM=gl \
221
+    -DX11_RENDER_SYSTEM=gl \
222
+    -DBUILD_SHARED_LIBS=1 \
223
+    ${NULL}
224
+
225
+    #-DRapidJSON_URL=%{SOURCE25}
226
+    #-DENABLE_INTERNAL_RapidJSON=ON
227
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
228
+    #-DFLATBUFFERS_URL=%{SOURCE26}
229
+    #-DENABLE_INTERNAL_FSTRCMP=ON
230
+    #-DFSTRCMP_URL=%{SOURCE27}
231
+
232
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
233
234
 %install
235
@@ -353,8 +411,11 @@
236
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
237
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
238
239
+# Tumbleweed does not have SuSEfirewall anymore:
240
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
241
 # SuSEfirewall service description
242
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
243
+%endif
244
245
 # Systemd service file
246
 %if %{without kodi_with_X11}
247
@@ -407,15 +468,19 @@
248
 %service_del_postun kodi.service
249
250
 %files
251
+%defattr(-,root,root)
252
 %doc version.txt
253
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
254
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
255
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
256
+%endif
257
 %{_bindir}/kodi
258
 %{_bindir}/kodi-standalone
259
 %{_bindir}/TexturePacker
260
+%{_bindir}/JsonSchemaBuilder
261
 %dir %{_libdir}/kodi
262
 %if %{with kodi_with_X11}
263
 %{_libdir}/kodi/kodi-xrandr
264
-%{_libdir}/kodi/kodi-x11
265
+%{_libdir}/kodi/kodi.bin
266
 %endif
267
 %{_datadir}/xsessions/kodi.desktop
268
 %{_datadir}/applications/kodi.desktop
269
@@ -457,8 +522,12 @@
270
 %{_kodi_addons_dir}/metadata.local/*
271
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
272
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
273
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
274
+%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
275
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
276
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
277
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
278
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
279
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
280
 %{_kodi_addons_dir}/repository.xbmc.org/*
281
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
282
@@ -537,6 +606,12 @@
283
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
284
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
285
 %{_kodi_addons_dir}/script.module.pycryptodome/*
286
+%dir %{_kodi_addons_dir}/metadata.generic.albums
287
+%{_kodi_addons_dir}/metadata.generic.albums/*
288
+%dir %{_kodi_addons_dir}/metadata.generic.artists
289
+%{_kodi_addons_dir}/metadata.generic.artists/*
290
+%dir %{_kodi_addons_dir}/kodi.binary.global.tools
291
+%{_kodi_addons_dir}/kodi.binary.global.tools/*
292
 %dir %{_libdir}/firewalld
293
 %dir %{_libdir}/firewalld/services
294
 %{_libdir}/firewalld/services/kodi-eventserver.xml
295
@@ -566,76 +641,63 @@
296
297
298
 %files devel
299
+%defattr(-,root,root)
300
 %dir %{_includedir}/kodi
301
-%{_includedir}/kodi/xbmc_epg_types.h
302
-%{_includedir}/kodi/xbmc_addon_dll.h
303
-%{_includedir}/kodi/xbmc_addon_types.h
304
 %dir %{_includedir}/kodi/tools
305
 %{_includedir}/kodi/tools/DllHelper.h
306
-%{_includedir}/kodi/Filesystem.h
307
-%{_includedir}/kodi/Network.h
308
-%{_includedir}/kodi/libXBMC_pvr.h
309
-%{_includedir}/kodi/libKODI_guilib.h
310
-%{_includedir}/kodi/libKODI_game.h
311
-%{_includedir}/kodi/kodi_game_dll.h
312
 %{_includedir}/kodi/AddonBase.h
313
-%{_includedir}/kodi/kodi_vfs_types.h
314
-%{_includedir}/kodi/StreamCrypto.h
315
-%{_includedir}/kodi/kodi_game_types.h
316
+%{_includedir}/kodi/AudioEngine.h
317
+%{_includedir}/kodi/Filesystem.h
318
 %{_includedir}/kodi/General.h
319
-%dir %{_includedir}/kodi/platform
320
-%dir %{_includedir}/kodi/platform/android
321
-%{_includedir}/kodi/platform/android/System.h
322
-%dir %{_includedir}/kodi/addon-instance
323
-%{_includedir}/kodi/addon-instance/VideoCodec.h
324
-%{_includedir}/kodi/addon-instance/Peripheral.h
325
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
326
-%{_includedir}/kodi/addon-instance/Visualization.h
327
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
328
-%{_includedir}/kodi/addon-instance/VFS.h
329
-%{_includedir}/kodi/addon-instance/Inputstream.h
330
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
331
-%{_includedir}/kodi/addon-instance/Screensaver.h
332
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
333
-%{_includedir}/kodi/libXBMC_addon.h
334
+%{_includedir}/kodi/Network.h
335
 %{_includedir}/kodi/versions.h
336
-%{_includedir}/kodi/xbmc_pvr_dll.h
337
-%{_includedir}/kodi/xbmc_pvr_types.h
338
-%{_includedir}/kodi/StreamCodec.h
339
+%dir %{_includedir}/kodi/addon-instance
340
+%{_includedir}/kodi/addon-instance/*
341
+%dir %{_includedir}/kodi/addon-instance/inputstream
342
+%{_includedir}/kodi/addon-instance/inputstream/*
343
+%dir %{_includedir}/kodi/addon-instance/peripheral
344
+%{_includedir}/kodi/addon-instance/peripheral/*
345
+%dir %{_includedir}/kodi/addon-instance/pvr
346
+%{_includedir}/kodi/addon-instance/pvr/*
347
+%dir %{_includedir}/kodi/c-api
348
+%{_includedir}/kodi/c-api/*
349
+%dir %{_includedir}/kodi/c-api/addon-instance
350
+%{_includedir}/kodi/c-api/addon-instance/*
351
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
352
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
353
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
354
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
355
+%dir %{_includedir}/kodi/c-api/gui
356
+%{_includedir}/kodi/c-api/gui/*
357
+%dir %{_includedir}/kodi/c-api/gui/controls
358
+%{_includedir}/kodi/c-api/gui/controls/*
359
+%dir %{_includedir}/kodi/c-api/gui/dialogs
360
+%{_includedir}/kodi/c-api/gui/dialogs/*
361
+%dir %{_includedir}/kodi/c-api/gui/input
362
+%{_includedir}/kodi/c-api/gui/input/*
363
+%dir %{_includedir}/kodi/c-api/platform
364
+%dir %{_includedir}/kodi/c-api/platform/android
365
+%{_includedir}/kodi/c-api/platform/android/*
366
 %dir %{_includedir}/kodi/gui
367
-%{_includedir}/kodi/gui/definitions.h
368
-%{_includedir}/kodi/gui/Window.h
369
-%{_includedir}/kodi/gui/General.h
370
-%{_includedir}/kodi/gui/ListItem.h
371
-%dir %{_includedir}/kodi/gui/dialogs
372
-%{_includedir}/kodi/gui/dialogs/Select.h
373
-%{_includedir}/kodi/gui/dialogs/OK.h
374
-%{_includedir}/kodi/gui/dialogs/YesNo.h
375
-%{_includedir}/kodi/gui/dialogs/Numeric.h
376
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
377
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
378
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
379
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
380
-%{_includedir}/kodi/gui/dialogs/Progress.h
381
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
382
+%{_includedir}/kodi/gui/*
383
 %dir %{_includedir}/kodi/gui/controls
384
-%{_includedir}/kodi/gui/controls/FadeLabel.h
385
-%{_includedir}/kodi/gui/controls/Edit.h
386
-%{_includedir}/kodi/gui/controls/TextBox.h
387
-%{_includedir}/kodi/gui/controls/Progress.h
388
-%{_includedir}/kodi/gui/controls/Rendering.h
389
-%{_includedir}/kodi/gui/controls/Slider.h
390
-%{_includedir}/kodi/gui/controls/Image.h
391
-%{_includedir}/kodi/gui/controls/Label.h
392
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
393
-%{_includedir}/kodi/gui/controls/RadioButton.h
394
-%{_includedir}/kodi/gui/controls/Button.h
395
-%{_includedir}/kodi/gui/controls/Spin.h
396
-%{_includedir}/kodi/DemuxCrypto.h
397
-%{_includedir}/kodi/DemuxPacket.h
398
-%{_includedir}/kodi/TimingConstants.h
399
-%{_includedir}/kodi/AEChannelData.h
400
-%{_includedir}/kodi/IFileTypes.h
401
-%{_includedir}/kodi/ActionIDs.h
402
-%{_includedir}/kodi/XBMC_vkeys.h
403
+%{_includedir}/kodi/gui/controls/*
404
+%dir %{_includedir}/kodi/gui/dialogs
405
+%{_includedir}/kodi/gui/dialogs/*
406
+%dir %{_includedir}/kodi/gui/gl
407
+%{_includedir}/kodi/gui/gl/*
408
+%dir %{_includedir}/kodi/gui/input
409
+%{_includedir}/kodi/gui/input/*
410
+%dir %{_includedir}/kodi/platform
411
+%dir %{_includedir}/kodi/platform/android
412
+%{_includedir}/kodi/platform/android/System.h
413
+%dir %{_includedir}/kodi/tools
414
+%{_includedir}/kodi/tools/*
415
+# %{_includedir}/kodi/AEChannelData.h
416
+# %{_includedir}/kodi/DemuxCrypto.h
417
+# %{_includedir}/kodi/DemuxPacket.h
418
+# %{_includedir}/kodi/InputStreamConstants.h
419
+# %{_includedir}/kodi/TimingConstants.h
420
+# %{_includedir}/kodi/XBMC_vkeys.h
421
+
422
 %changelog
423
​
View file
kodi-noX.spec Changed
423
 
1
@@ -18,15 +18,18 @@
2
3
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
4
 # kodi.* files with the pre_checkin.sh script
5
-%define kodi_version Leia
6
-%define ffmpeg_version 4.0.3-Leia-RC5
7
+%define kodi_version Matrix
8
+%define ffmpeg_version 4.3.1-Matrix-Beta1
9
 %define _kodi_addons_dir %{_datadir}/kodi/addons
10
 # set this parameter to enable building Kodi with ccache, debug information, etc.
11
-%define dev_build 1
12
+%define dev_build 0
13
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
14
 %bcond_without sysffmpeg
15
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
16
 %bcond_with kodi_with_X11
17
+# Enable or disable Wayland depending on whether the stack is usable or not:
18
+%bcond_with kodi_with_wayland
19
+
20
 %define kodi_platform none
21
 %define kodi_player none
22
23
@@ -46,7 +49,7 @@
24
 ExclusiveArch: does-not-build
25
26
 Name:           kodi-noX
27
-Version:        18.9
28
+Version:        19.0
29
 Release:        0
30
 Summary:        Media center (formerly known as XBMC)
31
 License:        GPL-2.0+ and GPL-3.0+
32
@@ -64,10 +67,10 @@
33
 Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
34
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
35
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
36
-%if %{without sysffmpeg}
37
+## if %{without sysffmpeg}
38
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
39
-%endif
40
-Patch0:         kodi-sse.patch
41
+## endif
42
+#Patch0:         kodi-sse.patch
43
 #Patch0:         kodi.arm.patch
44
 #Patch1:         no-xbmc-symbolic-link.patch
45
 #Patch2:         kodi-texturepacker.patch
46
@@ -77,9 +80,13 @@
47
 Patch6:         kodi-install.patch
48
 Patch7:         kodi-apply-dvdrun.patch
49
 Patch8:            kodi-libdrm.patch
50
+%if %{without kodi_with_wayland}
51
+Patch9:         kodi-disable-wayland.patch
52
+%endif
53
54
 BuildRequires:  autoconf
55
 BuildRequires:  automake
56
+BuildRequires:  binutils-gold
57
 BuildRequires:  desktop-file-utils
58
 BuildRequires:  fdupes
59
 BuildRequires:  gawk
60
@@ -91,6 +98,7 @@
61
 BuildRequires:  gcc8-c++
62
 %endif
63
 BuildRequires:  ghostscript
64
+BuildRequires:  graphviz
65
 BuildRequires:  groff-full
66
 BuildRequires:  libtool
67
 BuildRequires:  pkg-config
68
@@ -98,7 +106,7 @@
69
 BuildRequires:  fstrcmp-devel
70
 BuildRequires:  pkgconfig(fmt)
71
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
72
-BuildRequires:  pkgconfig(python2)
73
+BuildRequires:  pkgconfig(python3)
74
 BuildRequires:  libmysqlclient-devel
75
 BuildRequires:  pkgconfig(libass)
76
 BuildRequires:  pkgconfig(libcurl)
77
@@ -113,6 +121,7 @@
78
 BuildRequires:  pkgconfig(uuid)
79
 BuildRequires:  libyajl-devel >= 2
80
 BuildRequires:  pkgconfig(libidn2)
81
+BuildRequires:  pkgconfig(libinput)
82
 BuildRequires:  pkgconfig(libxml-2.0)
83
 BuildRequires:  pkgconfig(libxslt)
84
 BuildRequires:  pkgconfig(fribidi)
85
@@ -121,8 +130,9 @@
86
 BuildRequires:  pkgconfig(libpcre)
87
 BuildRequires:  pkgconfig(freetype2)
88
 BuildRequires:  pkgconfig(taglib) >= 1.9
89
-BuildRequires:  pkgconfig(libcdio)
90
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
91
 BuildRequires:  pkgconfig(lirc)
92
+BuildRequires:  pkgconfig(RapidJSON)
93
 %if %{with kodi_libbluray}
94
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
95
 %endif
96
@@ -132,17 +142,23 @@
97
 BuildRequires:  pkgconfig(libmicrohttpd)
98
 BuildRequires:  pkgconfig(libpulse) >= 1.0
99
 BuildRequires:  pkgconfig(avahi-client)
100
+BuildRequires:  pkgconfig(gbm)
101
 %if %{with kodi_with_X11}
102
 BuildRequires:  pkgconfig(x11)
103
 BuildRequires:  pkgconfig(xext)
104
 BuildRequires:  pkgconfig(xrandr)
105
 BuildRequires:  pkgconfig(libdrm)
106
 BuildRequires:  pkgconfig(egl)
107
+BuildRequires:  pkgconfig(xkbcommon)
108
 %endif
109
 BuildRequires:  pkgconfig(libssh)
110
 BuildRequires:  pkgconfig(smbclient)
111
 BuildRequires:  pkgconfig(libnfs)
112
+%if 0%{?suse_version} >= 1550
113
+BuildRequires:  pkgconfig(libplist-2.0)
114
+%else
115
 BuildRequires:  pkgconfig(libplist)
116
+%endif
117
 BuildRequires:  shairplay-devel
118
 BuildRequires:  pkgconfig(libudev)
119
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
120
@@ -175,7 +191,6 @@
121
 BuildRequires:  pkgconfig(jack)
122
 BuildRequires:  pkgconfig(libass)
123
 BuildRequires:  pkgconfig(libbluray)
124
-BuildRequires:  pkgconfig(libcdio)
125
 BuildRequires:  pkgconfig(libcdio_paranoia)
126
 BuildRequires:  pkgconfig(libdc1394-2)
127
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
128
@@ -223,6 +238,15 @@
129
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
130
 %endif
131
 %endif
132
+%if %{with kodi_with_wayland}
133
+BuildRequires:  pkgconfig(libva-wayland)
134
+BuildRequires:  pkgconfig(wayland-scanner)
135
+BuildRequires:  pkgconfig(wayland-protocols)
136
+BuildRequires:  pkgconfig(wayland-client)
137
+BuildRequires:  pkgconfig(wayland-client++)
138
+BuildRequires:  pkgconfig(wayland-cursor++)
139
+BuildRequires:  pkgconfig(wayland-egl++)
140
+%endif
141
 %if %{with enable_opengles}
142
 %if "%{kodi_platform}" == "none"
143
 BuildRequires:  Mesa-libEGL-devel
144
@@ -240,9 +264,7 @@
145
 BuildRequires:  gperf
146
 BuildRequires:  unzip
147
 BuildRequires:  zip
148
-%ifarch %ix86
149
 BuildRequires:  nasm
150
-%endif
151
 %if %{dev_build}
152
 BuildRequires:  ccache
153
 %endif
154
@@ -256,6 +278,15 @@
155
 BuildRequires:  libjpeg8-devel
156
 BuildRequires:  lzo-devel
157
 #
158
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
159
+BuildRequires:  libunistring-devel
160
+
161
+%if 0%{?suse_version} > 1510
162
+BuildRequires:  pkgconfig(gtest)
163
+%else
164
+BuildRequires: googletest-devel
165
+%endif
166
+#
167
 %{?systemd_requires}
168
169
 # kodi needs libnfs to access nfs sources, it is not automatically required
170
@@ -263,6 +294,7 @@
171
 #
172
 Obsoletes:      xbmc < %{version}
173
 Provides:       xbmc = %{version}
174
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
175
 %if %{with kodi_with_X11}
176
 Conflicts:      kodi
177
 %else
178
@@ -291,7 +323,21 @@
179
 Development files for Kodi Media Center
180
181
 %prep
182
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
183
+%setup -q -n xbmc-%{version}-%{kodi_version}
184
+#%setup -q -n xbmc-%{version}
185
+
186
+#%patch0
187
+#%patch1
188
+#%patch2
189
+#%patch3
190
+#%patch4
191
+#%patch5
192
+%patch6
193
+%patch7
194
+#%patch8 -p1
195
+%if %{without kodi_with_wayland}
196
+%patch9
197
+%endif
198
199
 %build
200
201
@@ -335,17 +381,29 @@
202
     -DCMAKE_C_COMPILER=$CC \
203
     -DCMAKE_CXX_COMPILER=$CXX \
204
     -DENABLE_INTERNAL_FMT=OFF \
205
-    -DENABLE_INTERNAL_RapidJSON=OFF \
206
-    -DFFMPEG_URL=%{SOURCE30} \
207
     -DENABLE_INTERNAL_FFMPEG=OFF \
208
+    -DFFMPEG_URL=%{SOURCE30} \
209
+    -DENABLE_INTERNAL_CDIO=OFF \
210
+    -DENABLE_INTERNAL_SPDLOG=OFF \
211
     -DCROSSGUID_URL=%{SOURCE20} \
212
     -DLIBDVDNAV_URL=%{SOURCE21} \
213
     -DLIBDVDCSS_URL=%{SOURCE22} \
214
     -DLIBDVDREAD_URL=%{SOURCE23} \
215
+    -DENABLE_INTERNAL_RapidJSON=OFF \
216
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
217
     -DENABLE_INTERNAL_FSTRCMP=OFF \
218
-    -DBUILD_SHARED_LIBS=1
219
-
220
+    -DAPP_RENDER_SYSTEM=gl \
221
+    -DX11_RENDER_SYSTEM=gl \
222
+    -DBUILD_SHARED_LIBS=1 \
223
+    ${NULL}
224
+
225
+    #-DRapidJSON_URL=%{SOURCE25}
226
+    #-DENABLE_INTERNAL_RapidJSON=ON
227
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
228
+    #-DFLATBUFFERS_URL=%{SOURCE26}
229
+    #-DENABLE_INTERNAL_FSTRCMP=ON
230
+    #-DFSTRCMP_URL=%{SOURCE27}
231
+
232
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
233
234
 %install
235
@@ -353,8 +411,11 @@
236
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
237
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
238
239
+# Tumbleweed does not have SuSEfirewall anymore:
240
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
241
 # SuSEfirewall service description
242
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
243
+%endif
244
245
 # Systemd service file
246
 %if %{without kodi_with_X11}
247
@@ -407,15 +468,19 @@
248
 %service_del_postun kodi.service
249
250
 %files
251
+%defattr(-,root,root)
252
 %doc version.txt
253
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
254
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
255
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
256
+%endif
257
 %{_bindir}/kodi
258
 %{_bindir}/kodi-standalone
259
 %{_bindir}/TexturePacker
260
+%{_bindir}/JsonSchemaBuilder
261
 %dir %{_libdir}/kodi
262
 %if %{with kodi_with_X11}
263
 %{_libdir}/kodi/kodi-xrandr
264
-%{_libdir}/kodi/kodi-x11
265
+%{_libdir}/kodi/kodi.bin
266
 %endif
267
 %{_datadir}/xsessions/kodi.desktop
268
 %{_datadir}/applications/kodi.desktop
269
@@ -457,8 +522,12 @@
270
 %{_kodi_addons_dir}/metadata.local/*
271
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
272
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
273
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
274
+%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
275
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
276
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
277
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
278
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
279
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
280
 %{_kodi_addons_dir}/repository.xbmc.org/*
281
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
282
@@ -537,6 +606,12 @@
283
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
284
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
285
 %{_kodi_addons_dir}/script.module.pycryptodome/*
286
+%dir %{_kodi_addons_dir}/metadata.generic.albums
287
+%{_kodi_addons_dir}/metadata.generic.albums/*
288
+%dir %{_kodi_addons_dir}/metadata.generic.artists
289
+%{_kodi_addons_dir}/metadata.generic.artists/*
290
+%dir %{_kodi_addons_dir}/kodi.binary.global.tools
291
+%{_kodi_addons_dir}/kodi.binary.global.tools/*
292
 %dir %{_libdir}/firewalld
293
 %dir %{_libdir}/firewalld/services
294
 %{_libdir}/firewalld/services/kodi-eventserver.xml
295
@@ -566,76 +641,63 @@
296
297
298
 %files devel
299
+%defattr(-,root,root)
300
 %dir %{_includedir}/kodi
301
-%{_includedir}/kodi/xbmc_epg_types.h
302
-%{_includedir}/kodi/xbmc_addon_dll.h
303
-%{_includedir}/kodi/xbmc_addon_types.h
304
 %dir %{_includedir}/kodi/tools
305
 %{_includedir}/kodi/tools/DllHelper.h
306
-%{_includedir}/kodi/Filesystem.h
307
-%{_includedir}/kodi/Network.h
308
-%{_includedir}/kodi/libXBMC_pvr.h
309
-%{_includedir}/kodi/libKODI_guilib.h
310
-%{_includedir}/kodi/libKODI_game.h
311
-%{_includedir}/kodi/kodi_game_dll.h
312
 %{_includedir}/kodi/AddonBase.h
313
-%{_includedir}/kodi/kodi_vfs_types.h
314
-%{_includedir}/kodi/StreamCrypto.h
315
-%{_includedir}/kodi/kodi_game_types.h
316
+%{_includedir}/kodi/AudioEngine.h
317
+%{_includedir}/kodi/Filesystem.h
318
 %{_includedir}/kodi/General.h
319
-%dir %{_includedir}/kodi/platform
320
-%dir %{_includedir}/kodi/platform/android
321
-%{_includedir}/kodi/platform/android/System.h
322
-%dir %{_includedir}/kodi/addon-instance
323
-%{_includedir}/kodi/addon-instance/VideoCodec.h
324
-%{_includedir}/kodi/addon-instance/Peripheral.h
325
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
326
-%{_includedir}/kodi/addon-instance/Visualization.h
327
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
328
-%{_includedir}/kodi/addon-instance/VFS.h
329
-%{_includedir}/kodi/addon-instance/Inputstream.h
330
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
331
-%{_includedir}/kodi/addon-instance/Screensaver.h
332
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
333
-%{_includedir}/kodi/libXBMC_addon.h
334
+%{_includedir}/kodi/Network.h
335
 %{_includedir}/kodi/versions.h
336
-%{_includedir}/kodi/xbmc_pvr_dll.h
337
-%{_includedir}/kodi/xbmc_pvr_types.h
338
-%{_includedir}/kodi/StreamCodec.h
339
+%dir %{_includedir}/kodi/addon-instance
340
+%{_includedir}/kodi/addon-instance/*
341
+%dir %{_includedir}/kodi/addon-instance/inputstream
342
+%{_includedir}/kodi/addon-instance/inputstream/*
343
+%dir %{_includedir}/kodi/addon-instance/peripheral
344
+%{_includedir}/kodi/addon-instance/peripheral/*
345
+%dir %{_includedir}/kodi/addon-instance/pvr
346
+%{_includedir}/kodi/addon-instance/pvr/*
347
+%dir %{_includedir}/kodi/c-api
348
+%{_includedir}/kodi/c-api/*
349
+%dir %{_includedir}/kodi/c-api/addon-instance
350
+%{_includedir}/kodi/c-api/addon-instance/*
351
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
352
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
353
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
354
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
355
+%dir %{_includedir}/kodi/c-api/gui
356
+%{_includedir}/kodi/c-api/gui/*
357
+%dir %{_includedir}/kodi/c-api/gui/controls
358
+%{_includedir}/kodi/c-api/gui/controls/*
359
+%dir %{_includedir}/kodi/c-api/gui/dialogs
360
+%{_includedir}/kodi/c-api/gui/dialogs/*
361
+%dir %{_includedir}/kodi/c-api/gui/input
362
+%{_includedir}/kodi/c-api/gui/input/*
363
+%dir %{_includedir}/kodi/c-api/platform
364
+%dir %{_includedir}/kodi/c-api/platform/android
365
+%{_includedir}/kodi/c-api/platform/android/*
366
 %dir %{_includedir}/kodi/gui
367
-%{_includedir}/kodi/gui/definitions.h
368
-%{_includedir}/kodi/gui/Window.h
369
-%{_includedir}/kodi/gui/General.h
370
-%{_includedir}/kodi/gui/ListItem.h
371
-%dir %{_includedir}/kodi/gui/dialogs
372
-%{_includedir}/kodi/gui/dialogs/Select.h
373
-%{_includedir}/kodi/gui/dialogs/OK.h
374
-%{_includedir}/kodi/gui/dialogs/YesNo.h
375
-%{_includedir}/kodi/gui/dialogs/Numeric.h
376
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
377
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
378
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
379
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
380
-%{_includedir}/kodi/gui/dialogs/Progress.h
381
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
382
+%{_includedir}/kodi/gui/*
383
 %dir %{_includedir}/kodi/gui/controls
384
-%{_includedir}/kodi/gui/controls/FadeLabel.h
385
-%{_includedir}/kodi/gui/controls/Edit.h
386
-%{_includedir}/kodi/gui/controls/TextBox.h
387
-%{_includedir}/kodi/gui/controls/Progress.h
388
-%{_includedir}/kodi/gui/controls/Rendering.h
389
-%{_includedir}/kodi/gui/controls/Slider.h
390
-%{_includedir}/kodi/gui/controls/Image.h
391
-%{_includedir}/kodi/gui/controls/Label.h
392
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
393
-%{_includedir}/kodi/gui/controls/RadioButton.h
394
-%{_includedir}/kodi/gui/controls/Button.h
395
-%{_includedir}/kodi/gui/controls/Spin.h
396
-%{_includedir}/kodi/DemuxCrypto.h
397
-%{_includedir}/kodi/DemuxPacket.h
398
-%{_includedir}/kodi/TimingConstants.h
399
-%{_includedir}/kodi/AEChannelData.h
400
-%{_includedir}/kodi/IFileTypes.h
401
-%{_includedir}/kodi/ActionIDs.h
402
-%{_includedir}/kodi/XBMC_vkeys.h
403
+%{_includedir}/kodi/gui/controls/*
404
+%dir %{_includedir}/kodi/gui/dialogs
405
+%{_includedir}/kodi/gui/dialogs/*
406
+%dir %{_includedir}/kodi/gui/gl
407
+%{_includedir}/kodi/gui/gl/*
408
+%dir %{_includedir}/kodi/gui/input
409
+%{_includedir}/kodi/gui/input/*
410
+%dir %{_includedir}/kodi/platform
411
+%dir %{_includedir}/kodi/platform/android
412
+%{_includedir}/kodi/platform/android/System.h
413
+%dir %{_includedir}/kodi/tools
414
+%{_includedir}/kodi/tools/*
415
+# %{_includedir}/kodi/AEChannelData.h
416
+# %{_includedir}/kodi/DemuxCrypto.h
417
+# %{_includedir}/kodi/DemuxPacket.h
418
+# %{_includedir}/kodi/InputStreamConstants.h
419
+# %{_includedir}/kodi/TimingConstants.h
420
+# %{_includedir}/kodi/XBMC_vkeys.h
421
+
422
 %changelog
423
​
View file
kodi.spec Changed
427
 
1
@@ -18,15 +18,18 @@
2
3
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
4
 # kodi.* files with the pre_checkin.sh script
5
-%define kodi_version Leia
6
-%define ffmpeg_version 4.0.3-Leia-RC5
7
+%define kodi_version Matrix
8
+%define ffmpeg_version 4.3.1-Matrix-Beta1
9
 %define _kodi_addons_dir %{_datadir}/kodi/addons
10
 # set this parameter to enable building Kodi with ccache, debug information, etc.
11
-%define dev_build 1
12
+%define dev_build 0
13
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
14
 %bcond_without sysffmpeg
15
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
16
 %bcond_without kodi_with_X11
17
+# Enable or disable Wayland depending on whether the stack is usable or not:
18
+%bcond_with kodi_with_wayland
19
+
20
 %define kodi_platform none
21
 %define kodi_player none
22
23
@@ -43,10 +46,10 @@
24
 #
25
 %bcond_without systemd
26
27
-ExclusiveArch: %ix86 x86_64 aarch64
28
+ExclusiveArch: %ix86 x86_64 %arm aarch64
29
30
 Name:           kodi
31
-Version:        18.9
32
+Version:        19.0
33
 Release:        0
34
 Summary:        Media center (formerly known as XBMC)
35
 License:        GPL-2.0+ and GPL-3.0+
36
@@ -64,10 +67,10 @@
37
 Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
38
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
39
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
40
-%if %{without sysffmpeg}
41
+## if %{without sysffmpeg}
42
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
43
-%endif
44
-Patch0:         kodi-sse.patch
45
+## endif
46
+#Patch0:         kodi-sse.patch
47
 #Patch0:         kodi.arm.patch
48
 #Patch1:         no-xbmc-symbolic-link.patch
49
 #Patch2:         kodi-texturepacker.patch
50
@@ -77,9 +80,13 @@
51
 Patch6:         kodi-install.patch
52
 Patch7:         kodi-apply-dvdrun.patch
53
 Patch8:            kodi-libdrm.patch
54
+%if %{without kodi_with_wayland}
55
+Patch9:         kodi-disable-wayland.patch
56
+%endif
57
58
 BuildRequires:  autoconf
59
 BuildRequires:  automake
60
+BuildRequires:  binutils-gold
61
 BuildRequires:  desktop-file-utils
62
 BuildRequires:  fdupes
63
 BuildRequires:  gawk
64
@@ -91,6 +98,7 @@
65
 BuildRequires:  gcc8-c++
66
 %endif
67
 BuildRequires:  ghostscript
68
+BuildRequires:  graphviz
69
 BuildRequires:  groff-full
70
 BuildRequires:  libtool
71
 BuildRequires:  pkg-config
72
@@ -98,7 +106,7 @@
73
 BuildRequires:  fstrcmp-devel
74
 BuildRequires:  pkgconfig(fmt)
75
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
76
-BuildRequires:  pkgconfig(python2)
77
+BuildRequires:  pkgconfig(python3)
78
 BuildRequires:  libmysqlclient-devel
79
 BuildRequires:  pkgconfig(libass)
80
 BuildRequires:  pkgconfig(libcurl)
81
@@ -113,6 +121,7 @@
82
 BuildRequires:  pkgconfig(uuid)
83
 BuildRequires:  libyajl-devel >= 2
84
 BuildRequires:  pkgconfig(libidn2)
85
+BuildRequires:  pkgconfig(libinput)
86
 BuildRequires:  pkgconfig(libxml-2.0)
87
 BuildRequires:  pkgconfig(libxslt)
88
 BuildRequires:  pkgconfig(fribidi)
89
@@ -121,8 +130,9 @@
90
 BuildRequires:  pkgconfig(libpcre)
91
 BuildRequires:  pkgconfig(freetype2)
92
 BuildRequires:  pkgconfig(taglib) >= 1.9
93
-BuildRequires:  pkgconfig(libcdio)
94
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
95
 BuildRequires:  pkgconfig(lirc)
96
+BuildRequires:  pkgconfig(RapidJSON)
97
 %if %{with kodi_libbluray}
98
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
99
 %endif
100
@@ -132,17 +142,23 @@
101
 BuildRequires:  pkgconfig(libmicrohttpd)
102
 BuildRequires:  pkgconfig(libpulse) >= 1.0
103
 BuildRequires:  pkgconfig(avahi-client)
104
+BuildRequires:  pkgconfig(gbm)
105
 %if %{with kodi_with_X11}
106
 BuildRequires:  pkgconfig(x11)
107
 BuildRequires:  pkgconfig(xext)
108
 BuildRequires:  pkgconfig(xrandr)
109
 BuildRequires:  pkgconfig(libdrm)
110
 BuildRequires:  pkgconfig(egl)
111
+BuildRequires:  pkgconfig(xkbcommon)
112
 %endif
113
 BuildRequires:  pkgconfig(libssh)
114
 BuildRequires:  pkgconfig(smbclient)
115
 BuildRequires:  pkgconfig(libnfs)
116
+%if 0%{?suse_version} >= 1550
117
+BuildRequires:  pkgconfig(libplist-2.0)
118
+%else
119
 BuildRequires:  pkgconfig(libplist)
120
+%endif
121
 BuildRequires:  shairplay-devel
122
 BuildRequires:  pkgconfig(libudev)
123
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
124
@@ -175,7 +191,6 @@
125
 BuildRequires:  pkgconfig(jack)
126
 BuildRequires:  pkgconfig(libass)
127
 BuildRequires:  pkgconfig(libbluray)
128
-BuildRequires:  pkgconfig(libcdio)
129
 BuildRequires:  pkgconfig(libcdio_paranoia)
130
 BuildRequires:  pkgconfig(libdc1394-2)
131
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
132
@@ -223,6 +238,15 @@
133
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
134
 %endif
135
 %endif
136
+%if %{with kodi_with_wayland}
137
+BuildRequires:  pkgconfig(libva-wayland)
138
+BuildRequires:  pkgconfig(wayland-scanner)
139
+BuildRequires:  pkgconfig(wayland-protocols)
140
+BuildRequires:  pkgconfig(wayland-client)
141
+BuildRequires:  pkgconfig(wayland-client++)
142
+BuildRequires:  pkgconfig(wayland-cursor++)
143
+BuildRequires:  pkgconfig(wayland-egl++)
144
+%endif
145
 %if %{with enable_opengles}
146
 %if "%{kodi_platform}" == "none"
147
 BuildRequires:  Mesa-libEGL-devel
148
@@ -240,9 +264,7 @@
149
 BuildRequires:  gperf
150
 BuildRequires:  unzip
151
 BuildRequires:  zip
152
-%ifarch %ix86
153
 BuildRequires:  nasm
154
-%endif
155
 %if %{dev_build}
156
 BuildRequires:  ccache
157
 %endif
158
@@ -256,6 +278,15 @@
159
 BuildRequires:  libjpeg8-devel
160
 BuildRequires:  lzo-devel
161
 #
162
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
163
+BuildRequires:  libunistring-devel
164
+
165
+%if 0%{?suse_version} > 1510
166
+BuildRequires:  pkgconfig(gtest)
167
+%else
168
+BuildRequires: googletest-devel
169
+%endif
170
+#
171
 %{?systemd_requires}
172
173
 # kodi needs libnfs to access nfs sources, it is not automatically required
174
@@ -263,6 +294,7 @@
175
 #
176
 Obsoletes:      xbmc < %{version}
177
 Provides:       xbmc = %{version}
178
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
179
 %if %{with kodi_with_X11}
180
 Conflicts:      kodi
181
 %else
182
@@ -291,7 +323,21 @@
183
 Development files for Kodi Media Center
184
185
 %prep
186
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
187
+%setup -q -n xbmc-%{version}-%{kodi_version}
188
+#%setup -q -n xbmc-%{version}
189
+
190
+#%patch0
191
+#%patch1
192
+#%patch2
193
+#%patch3
194
+#%patch4
195
+#%patch5
196
+%patch6
197
+%patch7
198
+#%patch8 -p1
199
+%if %{without kodi_with_wayland}
200
+%patch9
201
+%endif
202
203
 %build
204
205
@@ -335,17 +381,29 @@
206
     -DCMAKE_C_COMPILER=$CC \
207
     -DCMAKE_CXX_COMPILER=$CXX \
208
     -DENABLE_INTERNAL_FMT=OFF \
209
-    -DENABLE_INTERNAL_RapidJSON=OFF \
210
-    -DFFMPEG_URL=%{SOURCE30} \
211
     -DENABLE_INTERNAL_FFMPEG=OFF \
212
+    -DFFMPEG_URL=%{SOURCE30} \
213
+    -DENABLE_INTERNAL_CDIO=OFF \
214
+    -DENABLE_INTERNAL_SPDLOG=OFF \
215
     -DCROSSGUID_URL=%{SOURCE20} \
216
     -DLIBDVDNAV_URL=%{SOURCE21} \
217
     -DLIBDVDCSS_URL=%{SOURCE22} \
218
     -DLIBDVDREAD_URL=%{SOURCE23} \
219
+    -DENABLE_INTERNAL_RapidJSON=OFF \
220
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
221
     -DENABLE_INTERNAL_FSTRCMP=OFF \
222
-    -DBUILD_SHARED_LIBS=1
223
-
224
+    -DAPP_RENDER_SYSTEM=gl \
225
+    -DX11_RENDER_SYSTEM=gl \
226
+    -DBUILD_SHARED_LIBS=1 \
227
+    ${NULL}
228
+
229
+    #-DRapidJSON_URL=%{SOURCE25}
230
+    #-DENABLE_INTERNAL_RapidJSON=ON
231
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
232
+    #-DFLATBUFFERS_URL=%{SOURCE26}
233
+    #-DENABLE_INTERNAL_FSTRCMP=ON
234
+    #-DFSTRCMP_URL=%{SOURCE27}
235
+
236
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
237
238
 %install
239
@@ -353,8 +411,11 @@
240
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
241
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
242
243
+# Tumbleweed does not have SuSEfirewall anymore:
244
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
245
 # SuSEfirewall service description
246
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
247
+%endif
248
249
 # Systemd service file
250
 %if %{without kodi_with_X11}
251
@@ -407,15 +468,19 @@
252
 %service_del_postun kodi.service
253
254
 %files
255
+%defattr(-,root,root)
256
 %doc version.txt
257
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
258
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
259
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
260
+%endif
261
 %{_bindir}/kodi
262
 %{_bindir}/kodi-standalone
263
 %{_bindir}/TexturePacker
264
+%{_bindir}/JsonSchemaBuilder
265
 %dir %{_libdir}/kodi
266
 %if %{with kodi_with_X11}
267
 %{_libdir}/kodi/kodi-xrandr
268
-%{_libdir}/kodi/kodi-x11
269
+%{_libdir}/kodi/kodi.bin
270
 %endif
271
 %{_datadir}/xsessions/kodi.desktop
272
 %{_datadir}/applications/kodi.desktop
273
@@ -457,8 +522,12 @@
274
 %{_kodi_addons_dir}/metadata.local/*
275
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
276
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
277
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
278
+%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
279
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
280
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
281
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
282
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
283
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
284
 %{_kodi_addons_dir}/repository.xbmc.org/*
285
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
286
@@ -537,6 +606,12 @@
287
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
288
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
289
 %{_kodi_addons_dir}/script.module.pycryptodome/*
290
+%dir %{_kodi_addons_dir}/metadata.generic.albums
291
+%{_kodi_addons_dir}/metadata.generic.albums/*
292
+%dir %{_kodi_addons_dir}/metadata.generic.artists
293
+%{_kodi_addons_dir}/metadata.generic.artists/*
294
+%dir %{_kodi_addons_dir}/kodi.binary.global.tools
295
+%{_kodi_addons_dir}/kodi.binary.global.tools/*
296
 %dir %{_libdir}/firewalld
297
 %dir %{_libdir}/firewalld/services
298
 %{_libdir}/firewalld/services/kodi-eventserver.xml
299
@@ -566,76 +641,63 @@
300
301
302
 %files devel
303
+%defattr(-,root,root)
304
 %dir %{_includedir}/kodi
305
-%{_includedir}/kodi/xbmc_epg_types.h
306
-%{_includedir}/kodi/xbmc_addon_dll.h
307
-%{_includedir}/kodi/xbmc_addon_types.h
308
 %dir %{_includedir}/kodi/tools
309
 %{_includedir}/kodi/tools/DllHelper.h
310
-%{_includedir}/kodi/Filesystem.h
311
-%{_includedir}/kodi/Network.h
312
-%{_includedir}/kodi/libXBMC_pvr.h
313
-%{_includedir}/kodi/libKODI_guilib.h
314
-%{_includedir}/kodi/libKODI_game.h
315
-%{_includedir}/kodi/kodi_game_dll.h
316
 %{_includedir}/kodi/AddonBase.h
317
-%{_includedir}/kodi/kodi_vfs_types.h
318
-%{_includedir}/kodi/StreamCrypto.h
319
-%{_includedir}/kodi/kodi_game_types.h
320
+%{_includedir}/kodi/AudioEngine.h
321
+%{_includedir}/kodi/Filesystem.h
322
 %{_includedir}/kodi/General.h
323
-%dir %{_includedir}/kodi/platform
324
-%dir %{_includedir}/kodi/platform/android
325
-%{_includedir}/kodi/platform/android/System.h
326
-%dir %{_includedir}/kodi/addon-instance
327
-%{_includedir}/kodi/addon-instance/VideoCodec.h
328
-%{_includedir}/kodi/addon-instance/Peripheral.h
329
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
330
-%{_includedir}/kodi/addon-instance/Visualization.h
331
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
332
-%{_includedir}/kodi/addon-instance/VFS.h
333
-%{_includedir}/kodi/addon-instance/Inputstream.h
334
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
335
-%{_includedir}/kodi/addon-instance/Screensaver.h
336
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
337
-%{_includedir}/kodi/libXBMC_addon.h
338
+%{_includedir}/kodi/Network.h
339
 %{_includedir}/kodi/versions.h
340
-%{_includedir}/kodi/xbmc_pvr_dll.h
341
-%{_includedir}/kodi/xbmc_pvr_types.h
342
-%{_includedir}/kodi/StreamCodec.h
343
+%dir %{_includedir}/kodi/addon-instance
344
+%{_includedir}/kodi/addon-instance/*
345
+%dir %{_includedir}/kodi/addon-instance/inputstream
346
+%{_includedir}/kodi/addon-instance/inputstream/*
347
+%dir %{_includedir}/kodi/addon-instance/peripheral
348
+%{_includedir}/kodi/addon-instance/peripheral/*
349
+%dir %{_includedir}/kodi/addon-instance/pvr
350
+%{_includedir}/kodi/addon-instance/pvr/*
351
+%dir %{_includedir}/kodi/c-api
352
+%{_includedir}/kodi/c-api/*
353
+%dir %{_includedir}/kodi/c-api/addon-instance
354
+%{_includedir}/kodi/c-api/addon-instance/*
355
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
356
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
357
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
358
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
359
+%dir %{_includedir}/kodi/c-api/gui
360
+%{_includedir}/kodi/c-api/gui/*
361
+%dir %{_includedir}/kodi/c-api/gui/controls
362
+%{_includedir}/kodi/c-api/gui/controls/*
363
+%dir %{_includedir}/kodi/c-api/gui/dialogs
364
+%{_includedir}/kodi/c-api/gui/dialogs/*
365
+%dir %{_includedir}/kodi/c-api/gui/input
366
+%{_includedir}/kodi/c-api/gui/input/*
367
+%dir %{_includedir}/kodi/c-api/platform
368
+%dir %{_includedir}/kodi/c-api/platform/android
369
+%{_includedir}/kodi/c-api/platform/android/*
370
 %dir %{_includedir}/kodi/gui
371
-%{_includedir}/kodi/gui/definitions.h
372
-%{_includedir}/kodi/gui/Window.h
373
-%{_includedir}/kodi/gui/General.h
374
-%{_includedir}/kodi/gui/ListItem.h
375
-%dir %{_includedir}/kodi/gui/dialogs
376
-%{_includedir}/kodi/gui/dialogs/Select.h
377
-%{_includedir}/kodi/gui/dialogs/OK.h
378
-%{_includedir}/kodi/gui/dialogs/YesNo.h
379
-%{_includedir}/kodi/gui/dialogs/Numeric.h
380
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
381
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
382
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
383
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
384
-%{_includedir}/kodi/gui/dialogs/Progress.h
385
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
386
+%{_includedir}/kodi/gui/*
387
 %dir %{_includedir}/kodi/gui/controls
388
-%{_includedir}/kodi/gui/controls/FadeLabel.h
389
-%{_includedir}/kodi/gui/controls/Edit.h
390
-%{_includedir}/kodi/gui/controls/TextBox.h
391
-%{_includedir}/kodi/gui/controls/Progress.h
392
-%{_includedir}/kodi/gui/controls/Rendering.h
393
-%{_includedir}/kodi/gui/controls/Slider.h
394
-%{_includedir}/kodi/gui/controls/Image.h
395
-%{_includedir}/kodi/gui/controls/Label.h
396
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
397
-%{_includedir}/kodi/gui/controls/RadioButton.h
398
-%{_includedir}/kodi/gui/controls/Button.h
399
-%{_includedir}/kodi/gui/controls/Spin.h
400
-%{_includedir}/kodi/DemuxCrypto.h
401
-%{_includedir}/kodi/DemuxPacket.h
402
-%{_includedir}/kodi/TimingConstants.h
403
-%{_includedir}/kodi/AEChannelData.h
404
-%{_includedir}/kodi/IFileTypes.h
405
-%{_includedir}/kodi/ActionIDs.h
406
-%{_includedir}/kodi/XBMC_vkeys.h
407
+%{_includedir}/kodi/gui/controls/*
408
+%dir %{_includedir}/kodi/gui/dialogs
409
+%{_includedir}/kodi/gui/dialogs/*
410
+%dir %{_includedir}/kodi/gui/gl
411
+%{_includedir}/kodi/gui/gl/*
412
+%dir %{_includedir}/kodi/gui/input
413
+%{_includedir}/kodi/gui/input/*
414
+%dir %{_includedir}/kodi/platform
415
+%dir %{_includedir}/kodi/platform/android
416
+%{_includedir}/kodi/platform/android/System.h
417
+%dir %{_includedir}/kodi/tools
418
+%{_includedir}/kodi/tools/*
419
+# %{_includedir}/kodi/AEChannelData.h
420
+# %{_includedir}/kodi/DemuxCrypto.h
421
+# %{_includedir}/kodi/DemuxPacket.h
422
+# %{_includedir}/kodi/InputStreamConstants.h
423
+# %{_includedir}/kodi/TimingConstants.h
424
+# %{_includedir}/kodi/XBMC_vkeys.h
425
+
426
 %changelog
427
​
View file
kodi-apply-dvdrun.patch Changed
17
 
1
@@ -1,10 +1,10 @@
2
---- a/cmake/modules/FindLibDvd.cmake
3
-+++ b/cmake/modules/FindLibDvd.cmake
4
-@@ -201,6 +201,7 @@ else()
5
+--- cmake/modules/FindLibDvd.cmake.orig    2021-02-18 23:17:59.000000000 +0100
6
++++ cmake/modules/FindLibDvd.cmake 2021-03-07 16:17:14.557083228 +0100
7
+@@ -215,6 +215,7 @@ else()
8
                                                    "DVDREAD_CFLAGS=${DVDREAD_CFLAGS}"
9
                                                    "DVDREAD_LIBS=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/lib/libdvdread.la"
10
                                                    "LIBS=${DVDNAV_LIBS}"
11
-+              PATCH_COMMAND patch -p0 -i /home/abuild/rpmbuild/SOURCES/libdvdnav-no-return.patch
12
++                                PATCH_COMMAND patch -p0 -i /home/abuild/rpmbuild/SOURCES/libdvdnav-no-return.patch
13
+                                 BUILD_COMMAND ${MAKE_COMMAND}
14
                                  BUILD_BYPRODUCTS ${DVDNAV_LIBRARY})
15
      ExternalProject_Add_Step(dvdnav autoreconf
16
-                                     DEPENDEES download update patch
17
​
View file
kodi-disable-wayland.patch Added
16
 
1
@@ -0,0 +1,14 @@
2
+--- ./cmake/scripts/common/Platform.cmake.orig 2021-02-18 23:17:59.000000000 +0100
3
++++ ./cmake/scripts/common/Platform.cmake  2021-03-08 11:22:35.830254146 +0100
4
+@@ -3,9 +3,9 @@ if(NOT CORE_SYSTEM_NAME)
5
+ endif()
6
+
7
+ if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
8
+-  # Set default CORE_PLATFORM_NAME to X11 WAYLAND GBM
9
++  # Set default CORE_PLATFORM_NAME to X11 GBM
10
+   # This is overridden by user setting -DCORE_PLATFORM_NAME=<platform>
11
+-  set(_DEFAULT_PLATFORM X11 WAYLAND GBM)
12
++  set(_DEFAULT_PLATFORM X11 GBM)
13
+
14
+   if(NOT APP_RENDER_SYSTEM)
15
+     message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering. Please set APP_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
16
​
View file
kodi-install.patch Changed
20
 
1
@@ -1,6 +1,6 @@
2
---- a/cmake/scripts/linux/Install.cmake
3
-+++ b/cmake/scripts/linux/Install.cmake
4
-@@ -61,7 +61,7 @@ endif()
5
+--- cmake/scripts/linux/Install.cmake.orig 2018-11-11 21:01:16.067160310 +0200
6
++++ cmake/scripts/linux/Install.cmake  2018-11-13 08:42:56.792425432 +0200
7
+@@ -61,7 +61,7 @@
8
  # Install scripts
9
  install(PROGRAMS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}
10
                   ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}-standalone
11
@@ -9,7 +9,7 @@
12
          COMPONENT kodi-bin)
13
14
  # Install libraries
15
-@@ -131,7 +131,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/tools/
16
+@@ -131,7 +131,7 @@
17
  install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-eventserver.xml
18
                ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-http.xml
19
                ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-jsonrpc.xml
20
​
View file
kodi-libdrm.patch Changed
10
 
1
@@ -1,5 +1,6 @@
2
---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
3
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
4
+diff -rup xbmc-18.0rc4-Leia.orig/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp xbmc-18.0rc4-Leia/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
5
+--- xbmc-18.0rc4-Leia.orig/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp  2018-12-28 16:55:25.000000000 +0100
6
++++ xbmc-18.0rc4-Leia/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp   2019-01-06 12:27:49.219830548 +0100
7
 @@ -11,6 +11,9 @@
8
  #include "cores/VideoPlayer/DVDCodecs/Video/VAAPI.h"
9
  #include <va/va_drmcommon.h>
10
​
View file
_constraints Changed
14
 
1
@@ -2,10 +2,10 @@
2
 <constraints>
3
   <hardware>
4
     <disk>
5
-      <size unit="G">14</size>
6
+      <size unit="G">16</size>
7
     </disk>
8
     <memory>
9
-      <size unit="M">4096</size>
10
+      <size unit="M">5632</size>
11
     </memory>
12
   </hardware>
13
 </constraints>
14
​
View file
kodi.VERSION Changed
4
 
1
@@ -1,1 +1,1 @@
2
-20200727-45686bd
3
+20210218-f44fdfb
4
​
Refresh
kodi
Refresh 












































































Request History








Sagi Ben-Akiva's avatar




sagiben
created request
over 4 years ago















Sagi Ben-Akiva's avatar




sagiben
accepted request
over 4 years ago


































Locations





Help





Contact