Changes of Revision 43

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
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
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
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
kodi-noX-raspberry-pi.spec Changed
201
 
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
kodi-noX-raspberry-pi2.spec Changed
201
 
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
kodi-noX.spec Changed
201
 
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
kodi.spec Changed
201
 
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
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
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
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
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