Overview

Request 4023 (accepted)

- Use BuildRequires and configure options as checked by configure.ac

- Remove obsolete patch: add_rpi2_support.patch

Submit package home:olh:branches:Multimedia / kodi to package Multimedia / kodi
View file
kodi-noX-raspberry-pi.changes Changed
​x
 
1
@@ -1,4 +1,14 @@
2
 -------------------------------------------------------------------
3
+Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
4
+
5
+- Use BuildRequires and configure options as checked by configure.ac
6
+
7
+-------------------------------------------------------------------
8
+Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
9
+
10
+- Remove obsolete patch: add_rpi2_support.patch
11
+
12
+-------------------------------------------------------------------
13
 Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
14
15
 - Version update to Kodi 17.4 Krypton
16
​
View file
kodi-noX-raspberry-pi2.changes Changed
16
 
1
@@ -1,4 +1,14 @@
2
 -------------------------------------------------------------------
3
+Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
4
+
5
+- Use BuildRequires and configure options as checked by configure.ac
6
+
7
+-------------------------------------------------------------------
8
+Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
9
+
10
+- Remove obsolete patch: add_rpi2_support.patch
11
+
12
+-------------------------------------------------------------------
13
 Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
14
15
 - Version update to Kodi 17.4 Krypton
16
​
View file
kodi-noX.changes Changed
16
 
1
@@ -1,4 +1,14 @@
2
 -------------------------------------------------------------------
3
+Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
4
+
5
+- Use BuildRequires and configure options as checked by configure.ac
6
+
7
+-------------------------------------------------------------------
8
+Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
9
+
10
+- Remove obsolete patch: add_rpi2_support.patch
11
+
12
+-------------------------------------------------------------------
13
 Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
14
15
 - Version update to Kodi 17.4 Krypton
16
​
View file
kodi.changes Changed
16
 
1
@@ -1,4 +1,14 @@
2
 -------------------------------------------------------------------
3
+Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
4
+
5
+- Use BuildRequires and configure options as checked by configure.ac
6
+
7
+-------------------------------------------------------------------
8
+Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
9
+
10
+- Remove obsolete patch: add_rpi2_support.patch
11
+
12
+-------------------------------------------------------------------
13
 Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
14
15
 - Version update to Kodi 17.4 Krypton
16
​
View file
kodi-noX-raspberry-pi.spec Changed
450
 
1
@@ -23,24 +23,22 @@
2
 # set this parameter to enable building Kodi with ccache, debug information, etc.
3
 %define dev_build 0
4
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
5
-%define noX_build 1
6
-%if %{noX_build}
7
-# no X build needs openGL ES
8
-%bcond_with enable_opengl
9
-%bcond_without enable_opengles
10
+%bcond_with kodi_with_X11
11
+%define kodi_platform raspberry-pi
12
+%define kodi_player omxplayer
13
+
14
+%if %{with kodi_with_X11}
15
+%bcond_without enable_opengl
16
+%bcond_with enable_opengles
17
 %else
18
-%ifarch %arm armv6l armv6hl
19
+# no X build needs openGL ES
20
 %bcond_with enable_opengl
21
 %bcond_without enable_opengles
22
-%else
23
-%bcond_without enable_opengl
24
-%bcond_with enable_opengles
25
-%endif
26
 %endif
27
+#
28
 %bcond_without kodi_libbluray
29
30
-%define kodi_platform raspberry-pi
31
-%define kodi_player omxplayer
32
+ExclusiveArch: armv6l armv6hl
33
34
 Name:           kodi-noX-raspberry-pi
35
 Version:        17.4
36
@@ -60,134 +58,84 @@
37
 Source21:       libdvdnav-master.tar.gz
38
 Source22:       libdvdcss-master.tar.gz
39
 Source23:       libdvdread-master.tar.gz
40
+Patch0:         kodi.arm.patch
41
 Patch1:         no-xbmc-symbolic-link.patch
42
 Patch2:         kodi-texturepacker.patch
43
 Patch3:         crossguid_build64.patch
44
-Patch4:         add_rpi2_support.patch
45
-#Patch6:         kodi.cximage.gcc6.patch
46
-BuildRequires:  avahi-devel
47
-BuildRequires:  byacc
48
-BuildRequires:  ccache
49
-# needed to delete the fixed rpath introduced by smbclient
50
-BuildRequires:  chrpath
51
-BuildRequires:  cmake
52
+Patch4:         kodi.aarch64.patch
53
+BuildRequires:  autoconf
54
+BuildRequires:  automake
55
 BuildRequires:  desktop-file-utils
56
-BuildRequires:  doxygen
57
 BuildRequires:  fdupes
58
-BuildRequires:  flex
59
-%if %{with enable_opengl}
60
-BuildRequires:  ftgl-devel
61
-%endif
62
+BuildRequires:  gawk
63
 BuildRequires:  gcc-c++
64
-BuildRequires:  gettext
65
-BuildRequires:  giflib-devel
66
-BuildRequires:  glibc-devel
67
-BuildRequires:  gmp-devel
68
-BuildRequires:  gperf
69
-BuildRequires:  hicolor-icon-theme
70
-BuildRequires:  java
71
-BuildRequires:  libcap-devel
72
-%ifarch %ix86 x86_64
73
-BuildRequires:  libcrystalhd-devel
74
-%endif
75
-BuildRequires:  libfaac-devel
76
-BuildRequires:  libgcrypt-devel
77
-BuildRequires:  libgpg-error-devel
78
-BuildRequires:  libjasper-devel
79
-BuildRequires:  libjpeg-devel
80
-BuildRequires:  libmp3lame-devel
81
-BuildRequires:  libmysqlclient-devel
82
-#BuildRequires:  libsidplay2-1
83
-BuildRequires:  libstdc++-devel
84
 BuildRequires:  libtool
85
-BuildRequires:  libyajl-devel
86
-BuildRequires:  lzo-devel
87
-BuildRequires:  nasm
88
-BuildRequires:  readline-devel
89
-BuildRequires:  shairplay-devel
90
-#BuildRequires:  sidplay-libs-devel
91
-BuildRequires:  swig
92
-BuildRequires:  tinyxml-devel
93
-BuildRequires:  unzip
94
-%if !%{noX_build}
95
-BuildRequires:  xorg-x11-devel
96
-%endif
97
-BuildRequires:  yasm
98
-BuildRequires:  zip
99
-BuildRequires:  libx265-devel
100
-
101
 BuildRequires:  pkg-config
102
-BuildRequires:  pkgconfig(alsa)
103
-BuildRequires:  pkgconfig(bluez)
104
+BuildRequires:  pkgconfig(python2)
105
+BuildRequires:  pkgconfig(mariadb)
106
+BuildRequires:  pkgconfig(libass)
107
+BuildRequires:  pkgconfig(libcurl)
108
+BuildRequires:  pkgconfig(openssl)
109
+BuildRequires:  pkgconfig(gnutls)
110
+BuildRequires:  libgcrypt-devel
111
 BuildRequires:  pkgconfig(bzip2)
112
-BuildRequires:  pkgconfig(dcadec)
113
-BuildRequires:  pkgconfig(dvdread)
114
-BuildRequires:  pkgconfig(enca)
115
-BuildRequires:  pkgconfig(expat)
116
-BuildRequires:  pkgconfig(flac)
117
-BuildRequires:  pkgconfig(fontconfig)
118
-BuildRequires:  pkgconfig(freetype2)
119
+BuildRequires:  lzo-devel
120
+BuildRequires:  pkgconfig(zlib)
121
+BuildRequires:  pkgconfig(libcrypto)
122
+BuildRequires:  tinyxml-devel
123
+BuildRequires:  pkgconfig(uuid)
124
+BuildRequires:  pkgconfig(yajl) >= 2
125
+BuildRequires:  pkgconfig(libxml-2.0)
126
+BuildRequires:  pkgconfig(libxslt)
127
 BuildRequires:  pkgconfig(fribidi)
128
-%if %{with enable_opengl}
129
-BuildRequires:  pkgconfig(glew)
130
-%endif
131
-BuildRequires:  pkgconfig(glib-2.0)
132
-BuildRequires:  pkgconfig(gnutls)
133
-BuildRequires:  pkgconfig(lcms2)
134
-BuildRequires:  pkgconfig(libass) >= 0.9.7
135
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
136
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
137
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
138
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
139
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
140
+BuildRequires:  pkgconfig(sqlite3)
141
+BuildRequires:  pkgconfig(libpcrecpp)
142
+BuildRequires:  pkgconfig(libpcre)
143
+BuildRequires:  pkgconfig(freetype2)
144
+BuildRequires:  pkgconfig(taglib) >= 1.9
145
+BuildRequires:  pkgconfig(libcdio)
146
 %if %{with kodi_libbluray}
147
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
148
 %endif
149
-BuildRequires:  pkgconfig(libcdio)
150
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
151
-BuildRequires:  pkgconfig(libcurl)
152
+BuildRequires:  pkgconfig(alsa)
153
+BuildRequires:  pkgconfig(dbus-1)
154
 BuildRequires:  pkgconfig(libmicrohttpd)
155
-BuildRequires:  pkgconfig(libmodplug)
156
-BuildRequires:  pkgconfig(libmpeg2)
157
-BuildRequires:  pkgconfig(libmpg123)
158
+BuildRequires:  pkgconfig(libpulse) >= 1.0
159
+BuildRequires:  pkgconfig(avahi-client)
160
+%if %{with kodi_with_X11}
161
+BuildRequires:  pkgconfig(x11)
162
+BuildRequires:  pkgconfig(xext)
163
+BuildRequires:  pkgconfig(xrandr)
164
+BuildRequires:  pkgconfig(libdrm)
165
+BuildRequires:  pkgconfig(egl)
166
+%endif
167
+BuildRequires:  pkgconfig(libssh)
168
+BuildRequires:  pkgconfig(smbclient)
169
 BuildRequires:  pkgconfig(libnfs)
170
-BuildRequires:  pkgconfig(libpcre)
171
-BuildRequires:  pkgconfig(libpcrecpp)
172
 BuildRequires:  pkgconfig(libplist)
173
-BuildRequires:  pkgconfig(libpng)
174
-BuildRequires:  pkgconfig(libpulse)
175
-BuildRequires:  pkgconfig(librtmp)
176
-BuildRequires:  pkgconfig(libssh)
177
-BuildRequires:  pkgconfig(libtiff-4)
178
+BuildRequires:  shairplay-devel
179
 BuildRequires:  pkgconfig(libudev)
180
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
181
+BuildRequires:  pkgconfig(lcms2)
182
+BuildRequires:  pkgconfig(bluez)
183
+BuildRequires:  pkgconfig(libcap)
184
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
185
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
186
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
187
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
188
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
189
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
190
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
191
+BuildRequires:  swig
192
+BuildRequires:  java
193
+BuildRequires:  doxygen
194
 %if %{with enable_opengl}
195
-BuildRequires:  pkgconfig(libva)
196
-%endif
197
-BuildRequires:  pkgconfig(libxml-2.0)
198
-BuildRequires:  pkgconfig(libxslt)
199
-BuildRequires:  pkgconfig(mad)
200
-BuildRequires:  pkgconfig(nettle)
201
-BuildRequires:  pkgconfig(ogg)
202
-BuildRequires:  pkgconfig(python)
203
-BuildRequires:  pkgconfig(samplerate)
204
-%if !%{noX_build}
205
-BuildRequires:  pkgconfig(sdl2)
206
-%endif
207
-BuildRequires:  pkgconfig(smbclient)
208
-BuildRequires:  pkgconfig(sqlite3)
209
-BuildRequires:  pkgconfig(taglib) >= 1.8
210
-BuildRequires:  pkgconfig(tinyxml2)
211
-%if 0%{?suse_version} > 1320
212
-# Otherwise fails with configure error on libcec because udev.pc file is not found
213
-BuildRequires:  pkgconfig(udev)
214
-%endif
215
-BuildRequires:  pkgconfig(uuid)
216
-%if %{with enable_opengl}
217
+BuildRequires:  pkgconfig(gl)
218
+BuildRequires:  pkgconfig(glu)
219
 BuildRequires:  pkgconfig(vdpau)
220
+BuildRequires:  pkgconfig(libva) >= 0.38
221
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
222
 %endif
223
-BuildRequires:  pkgconfig(vorbis)
224
-BuildRequires:  pkgconfig(zlib)
225
-
226
 %if %{with enable_opengles}
227
 %if "%{kodi_platform}" == "none"
228
 BuildRequires:  Mesa-libEGL-devel
229
@@ -198,26 +146,37 @@
230
 %endif
231
 %endif
232
 %endif
233
-
234
-# kodi needs libnfs to access nfs sources, it is not automatically required
235
-Requires:       libnfs
236
-# Manage player deps
237
 %if %{kodi_player} == "omxplayer"
238
 Requires:       omxplayer
239
 %endif
240
-# glxinfo is needed to check hw accel
241
-%if 0%{?suse_version} >= 1220
242
-%if !%{noX_build}
243
-Requires:       Mesa-demo-x
244
-Requires:       xdpyinfo
245
+BuildRequires:  cmake
246
+BuildRequires:  gperf
247
+BuildRequires:  unzip
248
+BuildRequires:  zip
249
+%ifarch %ix86
250
+BuildRequires:  nasm
251
 %endif
252
+%if %{dev_build}
253
+BuildRequires:  ccache
254
 %endif
255
256
+# cpluff
257
+BuildRequires:  pkgconfig(expat)
258
+
259
+# TexturePacker
260
+BuildRequires:  pkgconfig(libpng)
261
+BuildRequires:  giflib-devel
262
+BuildRequires:  pkgconfig(libjpeg)
263
+BuildRequires:  lzo-devel
264
+#
265
+
266
+# kodi needs libnfs to access nfs sources, it is not automatically required
267
+Requires:       libnfs
268
+#
269
 Obsoletes:      xbmc < %{version}
270
 Provides:       xbmc = %{version}
271
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
272
-ExcludeArch:    ppc64
273
-%if %{noX_build}
274
+%if %{with kodi_with_X11}
275
 Conflicts:      kodi
276
 %else
277
 Conflicts:      kodi-noX
278
@@ -235,7 +194,7 @@
279
 Group:          Development/Languages/C and C++
280
 Requires:       %{name}
281
 BuildArch:      noarch
282
-%if %{noX_build}
283
+%if %{with kodi_with_X11}
284
 Conflicts:      kodi-devel
285
 %else
286
 Conflicts:      kodi-noX-devel
287
@@ -246,11 +205,11 @@
288
289
 %prep
290
 %setup -q -n xbmc-%{version}-%{kodi_version}
291
+%patch0
292
 %patch1
293
 %patch2
294
 %patch3
295
-%patch4 -p0
296
-#%patch6 -p1
297
+%patch4
298
299
 # Remove build time references so build-compare can do its work
300
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
301
@@ -281,7 +240,7 @@
302
303
 # build crossguid
304
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
305
-
306
+
307
 chmod +x bootstrap
308
 ./bootstrap
309
310
@@ -294,53 +253,63 @@
311
 %endif
312
313
 %configure \
314
-    --disable-libbluray \
315
     --with-ffmpeg=shared \
316
-    --enable-airplay \
317
+    --disable-shared-lib \
318
+    --disable-debug \
319
+    --disable-optimizations \
320
+    --disable-gl \
321
+    --disable-gles \
322
+    --disable-vdpau \
323
+    --disable-vaapi \
324
+    --disable-openmax \
325
+    --disable-tegra \
326
+    --disable-profiling \
327
+    --enable-x11 \
328
+    --disable-ccache \
329
     --enable-alsa \
330
-    --enable-avahi \
331
-    --enable-libcap \
332
-    --enable-libcec \
333
-    --enable-libusb \
334
-    --enable-mid \
335
-    --enable-mysql \
336
-    --enable-nfs \
337
+    --enable-dbus \
338
     --enable-pulse \
339
-    --enable-rtmp \
340
-    --enable-samba \
341
-    --enable-shared \
342
     --enable-ssh \
343
-    --enable-texturepacker \
344
+    --enable-samba \
345
+    --enable-nfs \
346
+    --enable-airplay \
347
+    --disable-airtunes \
348
     --enable-upnp \
349
+    --enable-mid \
350
+    --enable-avahi \
351
+    --disable-mdnsembedded \
352
+    --disable-non-free \
353
+    --enable-mysql \
354
     --enable-webserver \
355
+    --enable-optical-drive \
356
+    --disable-libbluray \
357
+    --enable-libxslt \
358
+    --enable-texturepacker \
359
+    --enable-udev \
360
+    --disable-libusb \
361
+    --enable-libcec \
362
+    --enable-lcms2 \
363
+    --enable-libbluetooth \
364
+    --enable-libcap \
365
+    --disable-gtest \
366
+    --disable-codec \
367
+    --disable-libav-compat \
368
 %if %{with enable_opengl}
369
     --enable-vaapi \
370
     --enable-vdpau \
371
     --enable-gl \
372
-%else
373
-    --disable-vaapi \
374
-    --disable-vdpau \
375
-    --disable-gl \
376
 %endif
377
 %if %{with enable_opengles}
378
     --enable-gles \
379
-%else
380
-    --disable-gles \
381
 %endif
382
-%if "%{kodi_platform}" != "none"
383
     --with-platform=%{kodi_platform} \
384
-%endif
385
 %if %{with kodi_libbluray}
386
     --enable-libbluray \
387
 %endif
388
 %if "%{kodi_player}" != "none"
389
     --enable-player="%{kodi_player}" \
390
 %endif
391
-%ifarch armv7l armv7hl
392
-    --enable-tegra \
393
-    --disable-neon \
394
-%endif
395
-%if %{noX_build}
396
+%if %{without kodi_with_X11}
397
     --disable-x11 \
398
     --disable-xrandr \
399
     --disable-sdl \
400
@@ -350,12 +319,7 @@
401
     --enable-debug \
402
     --enable-ccache \
403
 %endif
404
-%if !%{dev_build}
405
-    --disable-debug \
406
-    --disable-ccache \
407
-%endif
408
-    --disable-optimizations \
409
-    --disable-static
410
+    --disable-static
411
412
 make V=1 %{?_smp_mflags}
413
414
@@ -367,7 +331,7 @@
415
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
416
417
 # Systemd service file
418
-%if %{noX_build}
419
+%if %{without kodi_with_X11}
420
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
421
 %else
422
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
423
@@ -422,7 +386,7 @@
424
 %{_bindir}/kodi
425
 %dir %{_libdir}/kodi
426
 %{_libdir}/kodi/kodi.bin
427
-%if !%{noX_build}
428
+%if %{with kodi_with_X11}
429
 %{_libdir}/kodi/kodi-xrandr
430
 %endif
431
 %{_bindir}/kodi-standalone
432
@@ -435,7 +399,7 @@
433
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
434
 %{_datadir}/xsessions/kodi.desktop
435
 %{_datadir}/applications/kodi.desktop
436
-%{_datadir}/icons/hicolor/*/*/*.png
437
+%{_datadir}/icons/*
438
 %dir %{_datadir}/kodi
439
 %dir %{_datadir}/kodi/media
440
 %dir %{_datadir}/kodi/system
441
@@ -546,7 +510,7 @@
442
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
443
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
444
445
-%if %{noX_build}
446
+%if %{without kodi_with_X11}
447
 %{_unitdir}/kodi-noX.service
448
 %else
449
 %{_unitdir}/kodi.service
450
​
View file
kodi-noX-raspberry-pi2.spec Changed
450
 
1
@@ -23,24 +23,22 @@
2
 # set this parameter to enable building Kodi with ccache, debug information, etc.
3
 %define dev_build 0
4
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
5
-%define noX_build 1
6
-%if %{noX_build}
7
-# no X build needs openGL ES
8
-%bcond_with enable_opengl
9
-%bcond_without enable_opengles
10
+%bcond_with kodi_with_X11
11
+%define kodi_platform raspberry-pi2
12
+%define kodi_player omxplayer
13
+
14
+%if %{with kodi_with_X11}
15
+%bcond_without enable_opengl
16
+%bcond_with enable_opengles
17
 %else
18
-%ifarch %arm armv6l armv6hl
19
+# no X build needs openGL ES
20
 %bcond_with enable_opengl
21
 %bcond_without enable_opengles
22
-%else
23
-%bcond_without enable_opengl
24
-%bcond_with enable_opengles
25
-%endif
26
 %endif
27
+#
28
 %bcond_without kodi_libbluray
29
30
-%define kodi_platform raspberry-pi2
31
-%define kodi_player omxplayer
32
+ExclusiveArch: armv7l armv7hl
33
34
 Name:           kodi-noX-raspberry-pi2
35
 Version:        17.4
36
@@ -60,134 +58,84 @@
37
 Source21:       libdvdnav-master.tar.gz
38
 Source22:       libdvdcss-master.tar.gz
39
 Source23:       libdvdread-master.tar.gz
40
+Patch0:         kodi.arm.patch
41
 Patch1:         no-xbmc-symbolic-link.patch
42
 Patch2:         kodi-texturepacker.patch
43
 Patch3:         crossguid_build64.patch
44
-Patch4:         add_rpi2_support.patch
45
-#Patch6:         kodi.cximage.gcc6.patch
46
-BuildRequires:  avahi-devel
47
-BuildRequires:  byacc
48
-BuildRequires:  ccache
49
-# needed to delete the fixed rpath introduced by smbclient
50
-BuildRequires:  chrpath
51
-BuildRequires:  cmake
52
+Patch4:         kodi.aarch64.patch
53
+BuildRequires:  autoconf
54
+BuildRequires:  automake
55
 BuildRequires:  desktop-file-utils
56
-BuildRequires:  doxygen
57
 BuildRequires:  fdupes
58
-BuildRequires:  flex
59
-%if %{with enable_opengl}
60
-BuildRequires:  ftgl-devel
61
-%endif
62
+BuildRequires:  gawk
63
 BuildRequires:  gcc-c++
64
-BuildRequires:  gettext
65
-BuildRequires:  giflib-devel
66
-BuildRequires:  glibc-devel
67
-BuildRequires:  gmp-devel
68
-BuildRequires:  gperf
69
-BuildRequires:  hicolor-icon-theme
70
-BuildRequires:  java
71
-BuildRequires:  libcap-devel
72
-%ifarch %ix86 x86_64
73
-BuildRequires:  libcrystalhd-devel
74
-%endif
75
-BuildRequires:  libfaac-devel
76
-BuildRequires:  libgcrypt-devel
77
-BuildRequires:  libgpg-error-devel
78
-BuildRequires:  libjasper-devel
79
-BuildRequires:  libjpeg-devel
80
-BuildRequires:  libmp3lame-devel
81
-BuildRequires:  libmysqlclient-devel
82
-#BuildRequires:  libsidplay2-1
83
-BuildRequires:  libstdc++-devel
84
 BuildRequires:  libtool
85
-BuildRequires:  libyajl-devel
86
-BuildRequires:  lzo-devel
87
-BuildRequires:  nasm
88
-BuildRequires:  readline-devel
89
-BuildRequires:  shairplay-devel
90
-#BuildRequires:  sidplay-libs-devel
91
-BuildRequires:  swig
92
-BuildRequires:  tinyxml-devel
93
-BuildRequires:  unzip
94
-%if !%{noX_build}
95
-BuildRequires:  xorg-x11-devel
96
-%endif
97
-BuildRequires:  yasm
98
-BuildRequires:  zip
99
-BuildRequires:  libx265-devel
100
-
101
 BuildRequires:  pkg-config
102
-BuildRequires:  pkgconfig(alsa)
103
-BuildRequires:  pkgconfig(bluez)
104
+BuildRequires:  pkgconfig(python2)
105
+BuildRequires:  pkgconfig(mariadb)
106
+BuildRequires:  pkgconfig(libass)
107
+BuildRequires:  pkgconfig(libcurl)
108
+BuildRequires:  pkgconfig(openssl)
109
+BuildRequires:  pkgconfig(gnutls)
110
+BuildRequires:  libgcrypt-devel
111
 BuildRequires:  pkgconfig(bzip2)
112
-BuildRequires:  pkgconfig(dcadec)
113
-BuildRequires:  pkgconfig(dvdread)
114
-BuildRequires:  pkgconfig(enca)
115
-BuildRequires:  pkgconfig(expat)
116
-BuildRequires:  pkgconfig(flac)
117
-BuildRequires:  pkgconfig(fontconfig)
118
-BuildRequires:  pkgconfig(freetype2)
119
+BuildRequires:  lzo-devel
120
+BuildRequires:  pkgconfig(zlib)
121
+BuildRequires:  pkgconfig(libcrypto)
122
+BuildRequires:  tinyxml-devel
123
+BuildRequires:  pkgconfig(uuid)
124
+BuildRequires:  pkgconfig(yajl) >= 2
125
+BuildRequires:  pkgconfig(libxml-2.0)
126
+BuildRequires:  pkgconfig(libxslt)
127
 BuildRequires:  pkgconfig(fribidi)
128
-%if %{with enable_opengl}
129
-BuildRequires:  pkgconfig(glew)
130
-%endif
131
-BuildRequires:  pkgconfig(glib-2.0)
132
-BuildRequires:  pkgconfig(gnutls)
133
-BuildRequires:  pkgconfig(lcms2)
134
-BuildRequires:  pkgconfig(libass) >= 0.9.7
135
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
136
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
137
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
138
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
139
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
140
+BuildRequires:  pkgconfig(sqlite3)
141
+BuildRequires:  pkgconfig(libpcrecpp)
142
+BuildRequires:  pkgconfig(libpcre)
143
+BuildRequires:  pkgconfig(freetype2)
144
+BuildRequires:  pkgconfig(taglib) >= 1.9
145
+BuildRequires:  pkgconfig(libcdio)
146
 %if %{with kodi_libbluray}
147
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
148
 %endif
149
-BuildRequires:  pkgconfig(libcdio)
150
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
151
-BuildRequires:  pkgconfig(libcurl)
152
+BuildRequires:  pkgconfig(alsa)
153
+BuildRequires:  pkgconfig(dbus-1)
154
 BuildRequires:  pkgconfig(libmicrohttpd)
155
-BuildRequires:  pkgconfig(libmodplug)
156
-BuildRequires:  pkgconfig(libmpeg2)
157
-BuildRequires:  pkgconfig(libmpg123)
158
+BuildRequires:  pkgconfig(libpulse) >= 1.0
159
+BuildRequires:  pkgconfig(avahi-client)
160
+%if %{with kodi_with_X11}
161
+BuildRequires:  pkgconfig(x11)
162
+BuildRequires:  pkgconfig(xext)
163
+BuildRequires:  pkgconfig(xrandr)
164
+BuildRequires:  pkgconfig(libdrm)
165
+BuildRequires:  pkgconfig(egl)
166
+%endif
167
+BuildRequires:  pkgconfig(libssh)
168
+BuildRequires:  pkgconfig(smbclient)
169
 BuildRequires:  pkgconfig(libnfs)
170
-BuildRequires:  pkgconfig(libpcre)
171
-BuildRequires:  pkgconfig(libpcrecpp)
172
 BuildRequires:  pkgconfig(libplist)
173
-BuildRequires:  pkgconfig(libpng)
174
-BuildRequires:  pkgconfig(libpulse)
175
-BuildRequires:  pkgconfig(librtmp)
176
-BuildRequires:  pkgconfig(libssh)
177
-BuildRequires:  pkgconfig(libtiff-4)
178
+BuildRequires:  shairplay-devel
179
 BuildRequires:  pkgconfig(libudev)
180
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
181
+BuildRequires:  pkgconfig(lcms2)
182
+BuildRequires:  pkgconfig(bluez)
183
+BuildRequires:  pkgconfig(libcap)
184
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
185
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
186
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
187
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
188
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
189
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
190
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
191
+BuildRequires:  swig
192
+BuildRequires:  java
193
+BuildRequires:  doxygen
194
 %if %{with enable_opengl}
195
-BuildRequires:  pkgconfig(libva)
196
-%endif
197
-BuildRequires:  pkgconfig(libxml-2.0)
198
-BuildRequires:  pkgconfig(libxslt)
199
-BuildRequires:  pkgconfig(mad)
200
-BuildRequires:  pkgconfig(nettle)
201
-BuildRequires:  pkgconfig(ogg)
202
-BuildRequires:  pkgconfig(python)
203
-BuildRequires:  pkgconfig(samplerate)
204
-%if !%{noX_build}
205
-BuildRequires:  pkgconfig(sdl2)
206
-%endif
207
-BuildRequires:  pkgconfig(smbclient)
208
-BuildRequires:  pkgconfig(sqlite3)
209
-BuildRequires:  pkgconfig(taglib) >= 1.8
210
-BuildRequires:  pkgconfig(tinyxml2)
211
-%if 0%{?suse_version} > 1320
212
-# Otherwise fails with configure error on libcec because udev.pc file is not found
213
-BuildRequires:  pkgconfig(udev)
214
-%endif
215
-BuildRequires:  pkgconfig(uuid)
216
-%if %{with enable_opengl}
217
+BuildRequires:  pkgconfig(gl)
218
+BuildRequires:  pkgconfig(glu)
219
 BuildRequires:  pkgconfig(vdpau)
220
+BuildRequires:  pkgconfig(libva) >= 0.38
221
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
222
 %endif
223
-BuildRequires:  pkgconfig(vorbis)
224
-BuildRequires:  pkgconfig(zlib)
225
-
226
 %if %{with enable_opengles}
227
 %if "%{kodi_platform}" == "none"
228
 BuildRequires:  Mesa-libEGL-devel
229
@@ -198,26 +146,37 @@
230
 %endif
231
 %endif
232
 %endif
233
-
234
-# kodi needs libnfs to access nfs sources, it is not automatically required
235
-Requires:       libnfs
236
-# Manage player deps
237
 %if %{kodi_player} == "omxplayer"
238
 Requires:       omxplayer
239
 %endif
240
-# glxinfo is needed to check hw accel
241
-%if 0%{?suse_version} >= 1220
242
-%if !%{noX_build}
243
-Requires:       Mesa-demo-x
244
-Requires:       xdpyinfo
245
+BuildRequires:  cmake
246
+BuildRequires:  gperf
247
+BuildRequires:  unzip
248
+BuildRequires:  zip
249
+%ifarch %ix86
250
+BuildRequires:  nasm
251
 %endif
252
+%if %{dev_build}
253
+BuildRequires:  ccache
254
 %endif
255
256
+# cpluff
257
+BuildRequires:  pkgconfig(expat)
258
+
259
+# TexturePacker
260
+BuildRequires:  pkgconfig(libpng)
261
+BuildRequires:  giflib-devel
262
+BuildRequires:  pkgconfig(libjpeg)
263
+BuildRequires:  lzo-devel
264
+#
265
+
266
+# kodi needs libnfs to access nfs sources, it is not automatically required
267
+Requires:       libnfs
268
+#
269
 Obsoletes:      xbmc < %{version}
270
 Provides:       xbmc = %{version}
271
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
272
-ExcludeArch:    ppc64
273
-%if %{noX_build}
274
+%if %{with kodi_with_X11}
275
 Conflicts:      kodi
276
 %else
277
 Conflicts:      kodi-noX
278
@@ -235,7 +194,7 @@
279
 Group:          Development/Languages/C and C++
280
 Requires:       %{name}
281
 BuildArch:      noarch
282
-%if %{noX_build}
283
+%if %{with kodi_with_X11}
284
 Conflicts:      kodi-devel
285
 %else
286
 Conflicts:      kodi-noX-devel
287
@@ -246,11 +205,11 @@
288
289
 %prep
290
 %setup -q -n xbmc-%{version}-%{kodi_version}
291
+%patch0
292
 %patch1
293
 %patch2
294
 %patch3
295
-%patch4 -p0
296
-#%patch6 -p1
297
+%patch4
298
299
 # Remove build time references so build-compare can do its work
300
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
301
@@ -281,7 +240,7 @@
302
303
 # build crossguid
304
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
305
-
306
+
307
 chmod +x bootstrap
308
 ./bootstrap
309
310
@@ -294,53 +253,63 @@
311
 %endif
312
313
 %configure \
314
-    --disable-libbluray \
315
     --with-ffmpeg=shared \
316
-    --enable-airplay \
317
+    --disable-shared-lib \
318
+    --disable-debug \
319
+    --disable-optimizations \
320
+    --disable-gl \
321
+    --disable-gles \
322
+    --disable-vdpau \
323
+    --disable-vaapi \
324
+    --disable-openmax \
325
+    --disable-tegra \
326
+    --disable-profiling \
327
+    --enable-x11 \
328
+    --disable-ccache \
329
     --enable-alsa \
330
-    --enable-avahi \
331
-    --enable-libcap \
332
-    --enable-libcec \
333
-    --enable-libusb \
334
-    --enable-mid \
335
-    --enable-mysql \
336
-    --enable-nfs \
337
+    --enable-dbus \
338
     --enable-pulse \
339
-    --enable-rtmp \
340
-    --enable-samba \
341
-    --enable-shared \
342
     --enable-ssh \
343
-    --enable-texturepacker \
344
+    --enable-samba \
345
+    --enable-nfs \
346
+    --enable-airplay \
347
+    --disable-airtunes \
348
     --enable-upnp \
349
+    --enable-mid \
350
+    --enable-avahi \
351
+    --disable-mdnsembedded \
352
+    --disable-non-free \
353
+    --enable-mysql \
354
     --enable-webserver \
355
+    --enable-optical-drive \
356
+    --disable-libbluray \
357
+    --enable-libxslt \
358
+    --enable-texturepacker \
359
+    --enable-udev \
360
+    --disable-libusb \
361
+    --enable-libcec \
362
+    --enable-lcms2 \
363
+    --enable-libbluetooth \
364
+    --enable-libcap \
365
+    --disable-gtest \
366
+    --disable-codec \
367
+    --disable-libav-compat \
368
 %if %{with enable_opengl}
369
     --enable-vaapi \
370
     --enable-vdpau \
371
     --enable-gl \
372
-%else
373
-    --disable-vaapi \
374
-    --disable-vdpau \
375
-    --disable-gl \
376
 %endif
377
 %if %{with enable_opengles}
378
     --enable-gles \
379
-%else
380
-    --disable-gles \
381
 %endif
382
-%if "%{kodi_platform}" != "none"
383
     --with-platform=%{kodi_platform} \
384
-%endif
385
 %if %{with kodi_libbluray}
386
     --enable-libbluray \
387
 %endif
388
 %if "%{kodi_player}" != "none"
389
     --enable-player="%{kodi_player}" \
390
 %endif
391
-%ifarch armv7l armv7hl
392
-    --enable-tegra \
393
-    --disable-neon \
394
-%endif
395
-%if %{noX_build}
396
+%if %{without kodi_with_X11}
397
     --disable-x11 \
398
     --disable-xrandr \
399
     --disable-sdl \
400
@@ -350,12 +319,7 @@
401
     --enable-debug \
402
     --enable-ccache \
403
 %endif
404
-%if !%{dev_build}
405
-    --disable-debug \
406
-    --disable-ccache \
407
-%endif
408
-    --disable-optimizations \
409
-    --disable-static
410
+    --disable-static
411
412
 make V=1 %{?_smp_mflags}
413
414
@@ -367,7 +331,7 @@
415
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
416
417
 # Systemd service file
418
-%if %{noX_build}
419
+%if %{without kodi_with_X11}
420
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
421
 %else
422
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
423
@@ -422,7 +386,7 @@
424
 %{_bindir}/kodi
425
 %dir %{_libdir}/kodi
426
 %{_libdir}/kodi/kodi.bin
427
-%if !%{noX_build}
428
+%if %{with kodi_with_X11}
429
 %{_libdir}/kodi/kodi-xrandr
430
 %endif
431
 %{_bindir}/kodi-standalone
432
@@ -435,7 +399,7 @@
433
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
434
 %{_datadir}/xsessions/kodi.desktop
435
 %{_datadir}/applications/kodi.desktop
436
-%{_datadir}/icons/hicolor/*/*/*.png
437
+%{_datadir}/icons/*
438
 %dir %{_datadir}/kodi
439
 %dir %{_datadir}/kodi/media
440
 %dir %{_datadir}/kodi/system
441
@@ -546,7 +510,7 @@
442
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
443
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
444
445
-%if %{noX_build}
446
+%if %{without kodi_with_X11}
447
 %{_unitdir}/kodi-noX.service
448
 %else
449
 %{_unitdir}/kodi.service
450
​
View file
kodi-noX.spec Changed
450
 
1
@@ -23,24 +23,22 @@
2
 # set this parameter to enable building Kodi with ccache, debug information, etc.
3
 %define dev_build 0
4
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
5
-%define noX_build 1
6
-%if %{noX_build}
7
-# no X build needs openGL ES
8
-%bcond_with enable_opengl
9
-%bcond_without enable_opengles
10
+%bcond_with kodi_with_X11
11
+%define kodi_platform none
12
+%define kodi_player none
13
+
14
+%if %{with kodi_with_X11}
15
+%bcond_without enable_opengl
16
+%bcond_with enable_opengles
17
 %else
18
-%ifarch %arm armv6l armv6hl
19
+# no X build needs openGL ES
20
 %bcond_with enable_opengl
21
 %bcond_without enable_opengles
22
-%else
23
-%bcond_without enable_opengl
24
-%bcond_with enable_opengles
25
-%endif
26
 %endif
27
+#
28
 %bcond_without kodi_libbluray
29
30
-%define kodi_platform none
31
-%define kodi_player none
32
+ExclusiveArch: does-not-build
33
34
 Name:           kodi-noX
35
 Version:        17.4
36
@@ -60,134 +58,84 @@
37
 Source21:       libdvdnav-master.tar.gz
38
 Source22:       libdvdcss-master.tar.gz
39
 Source23:       libdvdread-master.tar.gz
40
+Patch0:         kodi.arm.patch
41
 Patch1:         no-xbmc-symbolic-link.patch
42
 Patch2:         kodi-texturepacker.patch
43
 Patch3:         crossguid_build64.patch
44
-Patch4:         add_rpi2_support.patch
45
-#Patch6:         kodi.cximage.gcc6.patch
46
-BuildRequires:  avahi-devel
47
-BuildRequires:  byacc
48
-BuildRequires:  ccache
49
-# needed to delete the fixed rpath introduced by smbclient
50
-BuildRequires:  chrpath
51
-BuildRequires:  cmake
52
+Patch4:         kodi.aarch64.patch
53
+BuildRequires:  autoconf
54
+BuildRequires:  automake
55
 BuildRequires:  desktop-file-utils
56
-BuildRequires:  doxygen
57
 BuildRequires:  fdupes
58
-BuildRequires:  flex
59
-%if %{with enable_opengl}
60
-BuildRequires:  ftgl-devel
61
-%endif
62
+BuildRequires:  gawk
63
 BuildRequires:  gcc-c++
64
-BuildRequires:  gettext
65
-BuildRequires:  giflib-devel
66
-BuildRequires:  glibc-devel
67
-BuildRequires:  gmp-devel
68
-BuildRequires:  gperf
69
-BuildRequires:  hicolor-icon-theme
70
-BuildRequires:  java
71
-BuildRequires:  libcap-devel
72
-%ifarch %ix86 x86_64
73
-BuildRequires:  libcrystalhd-devel
74
-%endif
75
-BuildRequires:  libfaac-devel
76
-BuildRequires:  libgcrypt-devel
77
-BuildRequires:  libgpg-error-devel
78
-BuildRequires:  libjasper-devel
79
-BuildRequires:  libjpeg-devel
80
-BuildRequires:  libmp3lame-devel
81
-BuildRequires:  libmysqlclient-devel
82
-#BuildRequires:  libsidplay2-1
83
-BuildRequires:  libstdc++-devel
84
 BuildRequires:  libtool
85
-BuildRequires:  libyajl-devel
86
-BuildRequires:  lzo-devel
87
-BuildRequires:  nasm
88
-BuildRequires:  readline-devel
89
-BuildRequires:  shairplay-devel
90
-#BuildRequires:  sidplay-libs-devel
91
-BuildRequires:  swig
92
-BuildRequires:  tinyxml-devel
93
-BuildRequires:  unzip
94
-%if !%{noX_build}
95
-BuildRequires:  xorg-x11-devel
96
-%endif
97
-BuildRequires:  yasm
98
-BuildRequires:  zip
99
-BuildRequires:  libx265-devel
100
-
101
 BuildRequires:  pkg-config
102
-BuildRequires:  pkgconfig(alsa)
103
-BuildRequires:  pkgconfig(bluez)
104
+BuildRequires:  pkgconfig(python2)
105
+BuildRequires:  pkgconfig(mariadb)
106
+BuildRequires:  pkgconfig(libass)
107
+BuildRequires:  pkgconfig(libcurl)
108
+BuildRequires:  pkgconfig(openssl)
109
+BuildRequires:  pkgconfig(gnutls)
110
+BuildRequires:  libgcrypt-devel
111
 BuildRequires:  pkgconfig(bzip2)
112
-BuildRequires:  pkgconfig(dcadec)
113
-BuildRequires:  pkgconfig(dvdread)
114
-BuildRequires:  pkgconfig(enca)
115
-BuildRequires:  pkgconfig(expat)
116
-BuildRequires:  pkgconfig(flac)
117
-BuildRequires:  pkgconfig(fontconfig)
118
-BuildRequires:  pkgconfig(freetype2)
119
+BuildRequires:  lzo-devel
120
+BuildRequires:  pkgconfig(zlib)
121
+BuildRequires:  pkgconfig(libcrypto)
122
+BuildRequires:  tinyxml-devel
123
+BuildRequires:  pkgconfig(uuid)
124
+BuildRequires:  pkgconfig(yajl) >= 2
125
+BuildRequires:  pkgconfig(libxml-2.0)
126
+BuildRequires:  pkgconfig(libxslt)
127
 BuildRequires:  pkgconfig(fribidi)
128
-%if %{with enable_opengl}
129
-BuildRequires:  pkgconfig(glew)
130
-%endif
131
-BuildRequires:  pkgconfig(glib-2.0)
132
-BuildRequires:  pkgconfig(gnutls)
133
-BuildRequires:  pkgconfig(lcms2)
134
-BuildRequires:  pkgconfig(libass) >= 0.9.7
135
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
136
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
137
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
138
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
139
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
140
+BuildRequires:  pkgconfig(sqlite3)
141
+BuildRequires:  pkgconfig(libpcrecpp)
142
+BuildRequires:  pkgconfig(libpcre)
143
+BuildRequires:  pkgconfig(freetype2)
144
+BuildRequires:  pkgconfig(taglib) >= 1.9
145
+BuildRequires:  pkgconfig(libcdio)
146
 %if %{with kodi_libbluray}
147
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
148
 %endif
149
-BuildRequires:  pkgconfig(libcdio)
150
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
151
-BuildRequires:  pkgconfig(libcurl)
152
+BuildRequires:  pkgconfig(alsa)
153
+BuildRequires:  pkgconfig(dbus-1)
154
 BuildRequires:  pkgconfig(libmicrohttpd)
155
-BuildRequires:  pkgconfig(libmodplug)
156
-BuildRequires:  pkgconfig(libmpeg2)
157
-BuildRequires:  pkgconfig(libmpg123)
158
+BuildRequires:  pkgconfig(libpulse) >= 1.0
159
+BuildRequires:  pkgconfig(avahi-client)
160
+%if %{with kodi_with_X11}
161
+BuildRequires:  pkgconfig(x11)
162
+BuildRequires:  pkgconfig(xext)
163
+BuildRequires:  pkgconfig(xrandr)
164
+BuildRequires:  pkgconfig(libdrm)
165
+BuildRequires:  pkgconfig(egl)
166
+%endif
167
+BuildRequires:  pkgconfig(libssh)
168
+BuildRequires:  pkgconfig(smbclient)
169
 BuildRequires:  pkgconfig(libnfs)
170
-BuildRequires:  pkgconfig(libpcre)
171
-BuildRequires:  pkgconfig(libpcrecpp)
172
 BuildRequires:  pkgconfig(libplist)
173
-BuildRequires:  pkgconfig(libpng)
174
-BuildRequires:  pkgconfig(libpulse)
175
-BuildRequires:  pkgconfig(librtmp)
176
-BuildRequires:  pkgconfig(libssh)
177
-BuildRequires:  pkgconfig(libtiff-4)
178
+BuildRequires:  shairplay-devel
179
 BuildRequires:  pkgconfig(libudev)
180
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
181
+BuildRequires:  pkgconfig(lcms2)
182
+BuildRequires:  pkgconfig(bluez)
183
+BuildRequires:  pkgconfig(libcap)
184
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
185
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
186
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
187
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
188
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
189
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
190
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
191
+BuildRequires:  swig
192
+BuildRequires:  java
193
+BuildRequires:  doxygen
194
 %if %{with enable_opengl}
195
-BuildRequires:  pkgconfig(libva)
196
-%endif
197
-BuildRequires:  pkgconfig(libxml-2.0)
198
-BuildRequires:  pkgconfig(libxslt)
199
-BuildRequires:  pkgconfig(mad)
200
-BuildRequires:  pkgconfig(nettle)
201
-BuildRequires:  pkgconfig(ogg)
202
-BuildRequires:  pkgconfig(python)
203
-BuildRequires:  pkgconfig(samplerate)
204
-%if !%{noX_build}
205
-BuildRequires:  pkgconfig(sdl2)
206
-%endif
207
-BuildRequires:  pkgconfig(smbclient)
208
-BuildRequires:  pkgconfig(sqlite3)
209
-BuildRequires:  pkgconfig(taglib) >= 1.8
210
-BuildRequires:  pkgconfig(tinyxml2)
211
-%if 0%{?suse_version} > 1320
212
-# Otherwise fails with configure error on libcec because udev.pc file is not found
213
-BuildRequires:  pkgconfig(udev)
214
-%endif
215
-BuildRequires:  pkgconfig(uuid)
216
-%if %{with enable_opengl}
217
+BuildRequires:  pkgconfig(gl)
218
+BuildRequires:  pkgconfig(glu)
219
 BuildRequires:  pkgconfig(vdpau)
220
+BuildRequires:  pkgconfig(libva) >= 0.38
221
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
222
 %endif
223
-BuildRequires:  pkgconfig(vorbis)
224
-BuildRequires:  pkgconfig(zlib)
225
-
226
 %if %{with enable_opengles}
227
 %if "%{kodi_platform}" == "none"
228
 BuildRequires:  Mesa-libEGL-devel
229
@@ -198,26 +146,37 @@
230
 %endif
231
 %endif
232
 %endif
233
-
234
-# kodi needs libnfs to access nfs sources, it is not automatically required
235
-Requires:       libnfs
236
-# Manage player deps
237
 %if %{kodi_player} == "omxplayer"
238
 Requires:       omxplayer
239
 %endif
240
-# glxinfo is needed to check hw accel
241
-%if 0%{?suse_version} >= 1220
242
-%if !%{noX_build}
243
-Requires:       Mesa-demo-x
244
-Requires:       xdpyinfo
245
+BuildRequires:  cmake
246
+BuildRequires:  gperf
247
+BuildRequires:  unzip
248
+BuildRequires:  zip
249
+%ifarch %ix86
250
+BuildRequires:  nasm
251
 %endif
252
+%if %{dev_build}
253
+BuildRequires:  ccache
254
 %endif
255
256
+# cpluff
257
+BuildRequires:  pkgconfig(expat)
258
+
259
+# TexturePacker
260
+BuildRequires:  pkgconfig(libpng)
261
+BuildRequires:  giflib-devel
262
+BuildRequires:  pkgconfig(libjpeg)
263
+BuildRequires:  lzo-devel
264
+#
265
+
266
+# kodi needs libnfs to access nfs sources, it is not automatically required
267
+Requires:       libnfs
268
+#
269
 Obsoletes:      xbmc < %{version}
270
 Provides:       xbmc = %{version}
271
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
272
-ExcludeArch:    ppc64
273
-%if %{noX_build}
274
+%if %{with kodi_with_X11}
275
 Conflicts:      kodi
276
 %else
277
 Conflicts:      kodi-noX
278
@@ -235,7 +194,7 @@
279
 Group:          Development/Languages/C and C++
280
 Requires:       %{name}
281
 BuildArch:      noarch
282
-%if %{noX_build}
283
+%if %{with kodi_with_X11}
284
 Conflicts:      kodi-devel
285
 %else
286
 Conflicts:      kodi-noX-devel
287
@@ -246,11 +205,11 @@
288
289
 %prep
290
 %setup -q -n xbmc-%{version}-%{kodi_version}
291
+%patch0
292
 %patch1
293
 %patch2
294
 %patch3
295
-%patch4 -p0
296
-#%patch6 -p1
297
+%patch4
298
299
 # Remove build time references so build-compare can do its work
300
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
301
@@ -281,7 +240,7 @@
302
303
 # build crossguid
304
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
305
-
306
+
307
 chmod +x bootstrap
308
 ./bootstrap
309
310
@@ -294,53 +253,63 @@
311
 %endif
312
313
 %configure \
314
-    --disable-libbluray \
315
     --with-ffmpeg=shared \
316
-    --enable-airplay \
317
+    --disable-shared-lib \
318
+    --disable-debug \
319
+    --disable-optimizations \
320
+    --disable-gl \
321
+    --disable-gles \
322
+    --disable-vdpau \
323
+    --disable-vaapi \
324
+    --disable-openmax \
325
+    --disable-tegra \
326
+    --disable-profiling \
327
+    --enable-x11 \
328
+    --disable-ccache \
329
     --enable-alsa \
330
-    --enable-avahi \
331
-    --enable-libcap \
332
-    --enable-libcec \
333
-    --enable-libusb \
334
-    --enable-mid \
335
-    --enable-mysql \
336
-    --enable-nfs \
337
+    --enable-dbus \
338
     --enable-pulse \
339
-    --enable-rtmp \
340
-    --enable-samba \
341
-    --enable-shared \
342
     --enable-ssh \
343
-    --enable-texturepacker \
344
+    --enable-samba \
345
+    --enable-nfs \
346
+    --enable-airplay \
347
+    --disable-airtunes \
348
     --enable-upnp \
349
+    --enable-mid \
350
+    --enable-avahi \
351
+    --disable-mdnsembedded \
352
+    --disable-non-free \
353
+    --enable-mysql \
354
     --enable-webserver \
355
+    --enable-optical-drive \
356
+    --disable-libbluray \
357
+    --enable-libxslt \
358
+    --enable-texturepacker \
359
+    --enable-udev \
360
+    --disable-libusb \
361
+    --enable-libcec \
362
+    --enable-lcms2 \
363
+    --enable-libbluetooth \
364
+    --enable-libcap \
365
+    --disable-gtest \
366
+    --disable-codec \
367
+    --disable-libav-compat \
368
 %if %{with enable_opengl}
369
     --enable-vaapi \
370
     --enable-vdpau \
371
     --enable-gl \
372
-%else
373
-    --disable-vaapi \
374
-    --disable-vdpau \
375
-    --disable-gl \
376
 %endif
377
 %if %{with enable_opengles}
378
     --enable-gles \
379
-%else
380
-    --disable-gles \
381
 %endif
382
-%if "%{kodi_platform}" != "none"
383
     --with-platform=%{kodi_platform} \
384
-%endif
385
 %if %{with kodi_libbluray}
386
     --enable-libbluray \
387
 %endif
388
 %if "%{kodi_player}" != "none"
389
     --enable-player="%{kodi_player}" \
390
 %endif
391
-%ifarch armv7l armv7hl
392
-    --enable-tegra \
393
-    --disable-neon \
394
-%endif
395
-%if %{noX_build}
396
+%if %{without kodi_with_X11}
397
     --disable-x11 \
398
     --disable-xrandr \
399
     --disable-sdl \
400
@@ -350,12 +319,7 @@
401
     --enable-debug \
402
     --enable-ccache \
403
 %endif
404
-%if !%{dev_build}
405
-    --disable-debug \
406
-    --disable-ccache \
407
-%endif
408
-    --disable-optimizations \
409
-    --disable-static
410
+    --disable-static
411
412
 make V=1 %{?_smp_mflags}
413
414
@@ -367,7 +331,7 @@
415
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
416
417
 # Systemd service file
418
-%if %{noX_build}
419
+%if %{without kodi_with_X11}
420
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
421
 %else
422
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
423
@@ -422,7 +386,7 @@
424
 %{_bindir}/kodi
425
 %dir %{_libdir}/kodi
426
 %{_libdir}/kodi/kodi.bin
427
-%if !%{noX_build}
428
+%if %{with kodi_with_X11}
429
 %{_libdir}/kodi/kodi-xrandr
430
 %endif
431
 %{_bindir}/kodi-standalone
432
@@ -435,7 +399,7 @@
433
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
434
 %{_datadir}/xsessions/kodi.desktop
435
 %{_datadir}/applications/kodi.desktop
436
-%{_datadir}/icons/hicolor/*/*/*.png
437
+%{_datadir}/icons/*
438
 %dir %{_datadir}/kodi
439
 %dir %{_datadir}/kodi/media
440
 %dir %{_datadir}/kodi/system
441
@@ -546,7 +510,7 @@
442
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
443
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
444
445
-%if %{noX_build}
446
+%if %{without kodi_with_X11}
447
 %{_unitdir}/kodi-noX.service
448
 %else
449
 %{_unitdir}/kodi.service
450
​
View file
kodi.spec Changed
450
 
1
@@ -23,24 +23,22 @@
2
 # set this parameter to enable building Kodi with ccache, debug information, etc.
3
 %define dev_build 0
4
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
5
-%define noX_build 0
6
-%if %{noX_build}
7
-# no X build needs openGL ES
8
-%bcond_with enable_opengl
9
-%bcond_without enable_opengles
10
+%bcond_without kodi_with_X11
11
+%define kodi_platform none
12
+%define kodi_player none
13
+
14
+%if %{with kodi_with_X11}
15
+%bcond_without enable_opengl
16
+%bcond_with enable_opengles
17
 %else
18
-%ifarch %arm armv6l armv6hl
19
+# no X build needs openGL ES
20
 %bcond_with enable_opengl
21
 %bcond_without enable_opengles
22
-%else
23
-%bcond_without enable_opengl
24
-%bcond_with enable_opengles
25
-%endif
26
 %endif
27
+#
28
 %bcond_without kodi_libbluray
29
30
-%define kodi_platform none
31
-%define kodi_player none
32
+ExclusiveArch: %ix86 x86_64 %arm aarch64
33
34
 Name:           kodi
35
 Version:        17.4
36
@@ -60,134 +58,84 @@
37
 Source21:       libdvdnav-master.tar.gz
38
 Source22:       libdvdcss-master.tar.gz
39
 Source23:       libdvdread-master.tar.gz
40
+Patch0:         kodi.arm.patch
41
 Patch1:         no-xbmc-symbolic-link.patch
42
 Patch2:         kodi-texturepacker.patch
43
 Patch3:         crossguid_build64.patch
44
-Patch4:         add_rpi2_support.patch
45
-#Patch6:         kodi.cximage.gcc6.patch
46
-BuildRequires:  avahi-devel
47
-BuildRequires:  byacc
48
-BuildRequires:  ccache
49
-# needed to delete the fixed rpath introduced by smbclient
50
-BuildRequires:  chrpath
51
-BuildRequires:  cmake
52
+Patch4:         kodi.aarch64.patch
53
+BuildRequires:  autoconf
54
+BuildRequires:  automake
55
 BuildRequires:  desktop-file-utils
56
-BuildRequires:  doxygen
57
 BuildRequires:  fdupes
58
-BuildRequires:  flex
59
-%if %{with enable_opengl}
60
-BuildRequires:  ftgl-devel
61
-%endif
62
+BuildRequires:  gawk
63
 BuildRequires:  gcc-c++
64
-BuildRequires:  gettext
65
-BuildRequires:  giflib-devel
66
-BuildRequires:  glibc-devel
67
-BuildRequires:  gmp-devel
68
-BuildRequires:  gperf
69
-BuildRequires:  hicolor-icon-theme
70
-BuildRequires:  java
71
-BuildRequires:  libcap-devel
72
-%ifarch %ix86 x86_64
73
-BuildRequires:  libcrystalhd-devel
74
-%endif
75
-BuildRequires:  libfaac-devel
76
-BuildRequires:  libgcrypt-devel
77
-BuildRequires:  libgpg-error-devel
78
-BuildRequires:  libjasper-devel
79
-BuildRequires:  libjpeg-devel
80
-BuildRequires:  libmp3lame-devel
81
-BuildRequires:  libmysqlclient-devel
82
-#BuildRequires:  libsidplay2-1
83
-BuildRequires:  libstdc++-devel
84
 BuildRequires:  libtool
85
-BuildRequires:  libyajl-devel
86
-BuildRequires:  lzo-devel
87
-BuildRequires:  nasm
88
-BuildRequires:  readline-devel
89
-BuildRequires:  shairplay-devel
90
-#BuildRequires:  sidplay-libs-devel
91
-BuildRequires:  swig
92
-BuildRequires:  tinyxml-devel
93
-BuildRequires:  unzip
94
-%if !%{noX_build}
95
-BuildRequires:  xorg-x11-devel
96
-%endif
97
-BuildRequires:  yasm
98
-BuildRequires:  zip
99
-BuildRequires:  libx265-devel
100
-
101
 BuildRequires:  pkg-config
102
-BuildRequires:  pkgconfig(alsa)
103
-BuildRequires:  pkgconfig(bluez)
104
+BuildRequires:  pkgconfig(python2)
105
+BuildRequires:  pkgconfig(mariadb)
106
+BuildRequires:  pkgconfig(libass)
107
+BuildRequires:  pkgconfig(libcurl)
108
+BuildRequires:  pkgconfig(openssl)
109
+BuildRequires:  pkgconfig(gnutls)
110
+BuildRequires:  libgcrypt-devel
111
 BuildRequires:  pkgconfig(bzip2)
112
-BuildRequires:  pkgconfig(dcadec)
113
-BuildRequires:  pkgconfig(dvdread)
114
-BuildRequires:  pkgconfig(enca)
115
-BuildRequires:  pkgconfig(expat)
116
-BuildRequires:  pkgconfig(flac)
117
-BuildRequires:  pkgconfig(fontconfig)
118
-BuildRequires:  pkgconfig(freetype2)
119
+BuildRequires:  lzo-devel
120
+BuildRequires:  pkgconfig(zlib)
121
+BuildRequires:  pkgconfig(libcrypto)
122
+BuildRequires:  tinyxml-devel
123
+BuildRequires:  pkgconfig(uuid)
124
+BuildRequires:  pkgconfig(yajl) >= 2
125
+BuildRequires:  pkgconfig(libxml-2.0)
126
+BuildRequires:  pkgconfig(libxslt)
127
 BuildRequires:  pkgconfig(fribidi)
128
-%if %{with enable_opengl}
129
-BuildRequires:  pkgconfig(glew)
130
-%endif
131
-BuildRequires:  pkgconfig(glib-2.0)
132
-BuildRequires:  pkgconfig(gnutls)
133
-BuildRequires:  pkgconfig(lcms2)
134
-BuildRequires:  pkgconfig(libass) >= 0.9.7
135
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
136
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
137
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
138
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
139
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
140
+BuildRequires:  pkgconfig(sqlite3)
141
+BuildRequires:  pkgconfig(libpcrecpp)
142
+BuildRequires:  pkgconfig(libpcre)
143
+BuildRequires:  pkgconfig(freetype2)
144
+BuildRequires:  pkgconfig(taglib) >= 1.9
145
+BuildRequires:  pkgconfig(libcdio)
146
 %if %{with kodi_libbluray}
147
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
148
 %endif
149
-BuildRequires:  pkgconfig(libcdio)
150
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
151
-BuildRequires:  pkgconfig(libcurl)
152
+BuildRequires:  pkgconfig(alsa)
153
+BuildRequires:  pkgconfig(dbus-1)
154
 BuildRequires:  pkgconfig(libmicrohttpd)
155
-BuildRequires:  pkgconfig(libmodplug)
156
-BuildRequires:  pkgconfig(libmpeg2)
157
-BuildRequires:  pkgconfig(libmpg123)
158
+BuildRequires:  pkgconfig(libpulse) >= 1.0
159
+BuildRequires:  pkgconfig(avahi-client)
160
+%if %{with kodi_with_X11}
161
+BuildRequires:  pkgconfig(x11)
162
+BuildRequires:  pkgconfig(xext)
163
+BuildRequires:  pkgconfig(xrandr)
164
+BuildRequires:  pkgconfig(libdrm)
165
+BuildRequires:  pkgconfig(egl)
166
+%endif
167
+BuildRequires:  pkgconfig(libssh)
168
+BuildRequires:  pkgconfig(smbclient)
169
 BuildRequires:  pkgconfig(libnfs)
170
-BuildRequires:  pkgconfig(libpcre)
171
-BuildRequires:  pkgconfig(libpcrecpp)
172
 BuildRequires:  pkgconfig(libplist)
173
-BuildRequires:  pkgconfig(libpng)
174
-BuildRequires:  pkgconfig(libpulse)
175
-BuildRequires:  pkgconfig(librtmp)
176
-BuildRequires:  pkgconfig(libssh)
177
-BuildRequires:  pkgconfig(libtiff-4)
178
+BuildRequires:  shairplay-devel
179
 BuildRequires:  pkgconfig(libudev)
180
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
181
+BuildRequires:  pkgconfig(lcms2)
182
+BuildRequires:  pkgconfig(bluez)
183
+BuildRequires:  pkgconfig(libcap)
184
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
185
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
186
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
187
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
188
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
189
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
190
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
191
+BuildRequires:  swig
192
+BuildRequires:  java
193
+BuildRequires:  doxygen
194
 %if %{with enable_opengl}
195
-BuildRequires:  pkgconfig(libva)
196
-%endif
197
-BuildRequires:  pkgconfig(libxml-2.0)
198
-BuildRequires:  pkgconfig(libxslt)
199
-BuildRequires:  pkgconfig(mad)
200
-BuildRequires:  pkgconfig(nettle)
201
-BuildRequires:  pkgconfig(ogg)
202
-BuildRequires:  pkgconfig(python)
203
-BuildRequires:  pkgconfig(samplerate)
204
-%if !%{noX_build}
205
-BuildRequires:  pkgconfig(sdl2)
206
-%endif
207
-BuildRequires:  pkgconfig(smbclient)
208
-BuildRequires:  pkgconfig(sqlite3)
209
-BuildRequires:  pkgconfig(taglib) >= 1.8
210
-BuildRequires:  pkgconfig(tinyxml2)
211
-%if 0%{?suse_version} > 1320
212
-# Otherwise fails with configure error on libcec because udev.pc file is not found
213
-BuildRequires:  pkgconfig(udev)
214
-%endif
215
-BuildRequires:  pkgconfig(uuid)
216
-%if %{with enable_opengl}
217
+BuildRequires:  pkgconfig(gl)
218
+BuildRequires:  pkgconfig(glu)
219
 BuildRequires:  pkgconfig(vdpau)
220
+BuildRequires:  pkgconfig(libva) >= 0.38
221
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
222
 %endif
223
-BuildRequires:  pkgconfig(vorbis)
224
-BuildRequires:  pkgconfig(zlib)
225
-
226
 %if %{with enable_opengles}
227
 %if "%{kodi_platform}" == "none"
228
 BuildRequires:  Mesa-libEGL-devel
229
@@ -198,26 +146,37 @@
230
 %endif
231
 %endif
232
 %endif
233
-
234
-# kodi needs libnfs to access nfs sources, it is not automatically required
235
-Requires:       libnfs
236
-# Manage player deps
237
 %if %{kodi_player} == "omxplayer"
238
 Requires:       omxplayer
239
 %endif
240
-# glxinfo is needed to check hw accel
241
-%if 0%{?suse_version} >= 1220
242
-%if !%{noX_build}
243
-Requires:       Mesa-demo-x
244
-Requires:       xdpyinfo
245
+BuildRequires:  cmake
246
+BuildRequires:  gperf
247
+BuildRequires:  unzip
248
+BuildRequires:  zip
249
+%ifarch %ix86
250
+BuildRequires:  nasm
251
 %endif
252
+%if %{dev_build}
253
+BuildRequires:  ccache
254
 %endif
255
256
+# cpluff
257
+BuildRequires:  pkgconfig(expat)
258
+
259
+# TexturePacker
260
+BuildRequires:  pkgconfig(libpng)
261
+BuildRequires:  giflib-devel
262
+BuildRequires:  pkgconfig(libjpeg)
263
+BuildRequires:  lzo-devel
264
+#
265
+
266
+# kodi needs libnfs to access nfs sources, it is not automatically required
267
+Requires:       libnfs
268
+#
269
 Obsoletes:      xbmc < %{version}
270
 Provides:       xbmc = %{version}
271
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
272
-ExcludeArch:    ppc64
273
-%if %{noX_build}
274
+%if %{with kodi_with_X11}
275
 Conflicts:      kodi
276
 %else
277
 Conflicts:      kodi-noX
278
@@ -235,7 +194,7 @@
279
 Group:          Development/Languages/C and C++
280
 Requires:       %{name}
281
 BuildArch:      noarch
282
-%if %{noX_build}
283
+%if %{with kodi_with_X11}
284
 Conflicts:      kodi-devel
285
 %else
286
 Conflicts:      kodi-noX-devel
287
@@ -246,11 +205,11 @@
288
289
 %prep
290
 %setup -q -n xbmc-%{version}-%{kodi_version}
291
+%patch0
292
 %patch1
293
 %patch2
294
 %patch3
295
-%patch4 -p0
296
-#%patch6 -p1
297
+%patch4
298
299
 # Remove build time references so build-compare can do its work
300
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
301
@@ -281,7 +240,7 @@
302
303
 # build crossguid
304
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
305
-
306
+
307
 chmod +x bootstrap
308
 ./bootstrap
309
310
@@ -294,53 +253,63 @@
311
 %endif
312
313
 %configure \
314
-    --disable-libbluray \
315
     --with-ffmpeg=shared \
316
-    --enable-airplay \
317
+    --disable-shared-lib \
318
+    --disable-debug \
319
+    --disable-optimizations \
320
+    --disable-gl \
321
+    --disable-gles \
322
+    --disable-vdpau \
323
+    --disable-vaapi \
324
+    --disable-openmax \
325
+    --disable-tegra \
326
+    --disable-profiling \
327
+    --enable-x11 \
328
+    --disable-ccache \
329
     --enable-alsa \
330
-    --enable-avahi \
331
-    --enable-libcap \
332
-    --enable-libcec \
333
-    --enable-libusb \
334
-    --enable-mid \
335
-    --enable-mysql \
336
-    --enable-nfs \
337
+    --enable-dbus \
338
     --enable-pulse \
339
-    --enable-rtmp \
340
-    --enable-samba \
341
-    --enable-shared \
342
     --enable-ssh \
343
-    --enable-texturepacker \
344
+    --enable-samba \
345
+    --enable-nfs \
346
+    --enable-airplay \
347
+    --disable-airtunes \
348
     --enable-upnp \
349
+    --enable-mid \
350
+    --enable-avahi \
351
+    --disable-mdnsembedded \
352
+    --disable-non-free \
353
+    --enable-mysql \
354
     --enable-webserver \
355
+    --enable-optical-drive \
356
+    --disable-libbluray \
357
+    --enable-libxslt \
358
+    --enable-texturepacker \
359
+    --enable-udev \
360
+    --disable-libusb \
361
+    --enable-libcec \
362
+    --enable-lcms2 \
363
+    --enable-libbluetooth \
364
+    --enable-libcap \
365
+    --disable-gtest \
366
+    --disable-codec \
367
+    --disable-libav-compat \
368
 %if %{with enable_opengl}
369
     --enable-vaapi \
370
     --enable-vdpau \
371
     --enable-gl \
372
-%else
373
-    --disable-vaapi \
374
-    --disable-vdpau \
375
-    --disable-gl \
376
 %endif
377
 %if %{with enable_opengles}
378
     --enable-gles \
379
-%else
380
-    --disable-gles \
381
 %endif
382
-%if "%{kodi_platform}" != "none"
383
     --with-platform=%{kodi_platform} \
384
-%endif
385
 %if %{with kodi_libbluray}
386
     --enable-libbluray \
387
 %endif
388
 %if "%{kodi_player}" != "none"
389
     --enable-player="%{kodi_player}" \
390
 %endif
391
-%ifarch armv7l armv7hl
392
-    --enable-tegra \
393
-    --disable-neon \
394
-%endif
395
-%if %{noX_build}
396
+%if %{without kodi_with_X11}
397
     --disable-x11 \
398
     --disable-xrandr \
399
     --disable-sdl \
400
@@ -350,12 +319,7 @@
401
     --enable-debug \
402
     --enable-ccache \
403
 %endif
404
-%if !%{dev_build}
405
-    --disable-debug \
406
-    --disable-ccache \
407
-%endif
408
-    --disable-optimizations \
409
-    --disable-static
410
+    --disable-static
411
412
 make V=1 %{?_smp_mflags}
413
414
@@ -367,7 +331,7 @@
415
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
416
417
 # Systemd service file
418
-%if %{noX_build}
419
+%if %{without kodi_with_X11}
420
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
421
 %else
422
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
423
@@ -422,7 +386,7 @@
424
 %{_bindir}/kodi
425
 %dir %{_libdir}/kodi
426
 %{_libdir}/kodi/kodi.bin
427
-%if !%{noX_build}
428
+%if %{with kodi_with_X11}
429
 %{_libdir}/kodi/kodi-xrandr
430
 %endif
431
 %{_bindir}/kodi-standalone
432
@@ -435,7 +399,7 @@
433
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
434
 %{_datadir}/xsessions/kodi.desktop
435
 %{_datadir}/applications/kodi.desktop
436
-%{_datadir}/icons/hicolor/*/*/*.png
437
+%{_datadir}/icons/*
438
 %dir %{_datadir}/kodi
439
 %dir %{_datadir}/kodi/media
440
 %dir %{_datadir}/kodi/system
441
@@ -546,7 +510,7 @@
442
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
443
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
444
445
-%if %{noX_build}
446
+%if %{without kodi_with_X11}
447
 %{_unitdir}/kodi-noX.service
448
 %else
449
 %{_unitdir}/kodi.service
450
​
View file
add_rpi2_support.patch Deleted
21
 
1
@@ -1,19 +0,0 @@
2
---- configure.ac.orig  2017-02-18 22:07:47.780367654 +0200
3
-+++ configure.ac   2017-02-18 22:09:13.074802930 +0200
4
-@@ -679,7 +679,16 @@
5
-   raspberry-pi2)
6
-      target_platform=target_raspberry_pi
7
-      use_neon=yes
8
-+     use_arch="arm"
9
-      use_cpu=cortex-a7
10
-+     use_hardcoded_tables="yes"
11
-+     use_openmax=no
12
-+     ARCH="arm"
13
-+     AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
14
-+     USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])
15
-+     USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])
16
-+     CFLAGS="$CFLAGS"
17
-+     CXXFLAGS="$CXXFLAGS"
18
-      ;;
19
- esac
20
-
21
​
View file
kodi.aarch64.patch Added
42
 
1
@@ -0,0 +1,40 @@
2
+--- configure.ac.orig
3
++++ configure.ac
4
+@@ -624,13 +624,6 @@ case $host in
5
+      ARCH="aarch64"
6
+      use_arch="aarch64"
7
+      use_neon=yes
8
+-     # Check whether --enable-gl was given.
9
+-     if test "${enable_gl+set}" = set; then :
10
+-       enableval=$enable_gl; use_gl=$enableval
11
+-     else
12
+-       use_gl=no
13
+-       use_gles=yes
14
+-     fi
15
+      USE_STATIC_FFMPEG=1
16
+      ;;
17
+   arm*-*linux-android*)
18
+--- m4/xbmc_arch.m4.orig
19
++++ m4/xbmc_arch.m4
20
+@@ -23,6 +23,9 @@ case $build in
21
+   powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
22
+      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
23
+      ;;
24
++  aarch64-*-linux-gnu*|aarch64-*-linux-uclibc*)
25
++     AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
26
++     ;;
27
+   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
28
+      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
29
+      ;;
30
+--- tools/depends/configure.ac.orig
31
++++ tools/depends/configure.ac
32
+@@ -120,6 +120,9 @@ platform_cc=gcc
33
+ platform_cxx=g++
34
+
35
+ case $build in
36
++  aarch64*-*-linux-gnu*|aarch*-*-linux-be*)
37
++    build_os="linux"
38
++  ;;
39
+   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
40
+     build_os="linux"
41
+   ;;
42
​
View file
kodi.arm.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+--- configure.ac.orig
3
++++ configure.ac
4
+@@ -617,8 +617,6 @@ case $host in
5
+      ARCH="arm"
6
+      use_arch="arm"
7
+      use_neon=yes
8
+-     use_gles=yes
9
+-     use_gl=no
10
+      USE_STATIC_FFMPEG=1
11
+      ;;
12
+   aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
13
​
View file
pre_checkin.sh Changed
36
 
1
@@ -2,7 +2,9 @@
2
3
 name=kodi
4
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
5
-sed -e "s/%define noX_build 0/%define noX_build 1/g
6
+ARCH_RESTRICTIONS="does-not-build"
7
+sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
8
+   s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
9
    s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
10
 cp $name.changes $name-noX.changes
11
12
@@ -15,8 +17,9 @@
13
 for BOARDNAME in $armv6_platforms; do
14
    ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now
15
    # Enable platform build for the given platform (only noX version)
16
-   sed -e "s/%define noX_build 0/%define noX_build 1/g
17
-   s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
18
+   sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
19
+   s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
20
+   s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
21
    s/%define kodi_player none/%define kodi_player omxplayer/g
22
    s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
23
    cp $name.changes $name-noX-$BOARDNAME.changes
24
@@ -25,8 +28,9 @@
25
 for BOARDNAME in $armv7_platforms; do
26
    ARCH_RESTRICTIONS="armv7l armv7hl"
27
    # Enable platform build for the given platform (only noX version)
28
-   sed -e "s/%define noX_build 0/%define noX_build 1/g
29
-   s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
30
+   sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
31
+   s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
32
+   s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
33
    s/%define kodi_player none/%define kodi_player omxplayer/g
34
    s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
35
    cp $name.changes $name-noX-$BOARDNAME.changes
36
​
Refresh

No build results available

Refresh

No rpmlint results available

Request History
Olaf Hering's avatar

olh created request almost 8 years ago

- Use BuildRequires and configure options as checked by configure.ac

- Remove obsolete patch: add_rpi2_support.patch

Olaf Hering's avatar

olh accepted request almost 8 years ago

Locations
Help
Contact