Overview

Request 1010 (accepted)

- Update to 13.0 Gotham:
* Dramatic Audio Engine Improvements
* Improved UPnP capabilities
* Settings Improvements
* Making Subtitle Search Better
* Stereoscopic 3D Rendering
* Raspberry Pi and Android speed improvements
* An Extended Python and JSON-RPC API for developers
* Many minor fixes and improvements
- Add enable-external-ffmpeg.patch: build again system ffmpeg.
- Drop xbmc-12.2-subtitles.patch: fixed upstream.
- Drop samba4-fix.patch: fixed upstream.
- Drop git_rev.patch: fixed upstream.

Submit package home:Fisiu:branches:Multimedia / xbmc to package Multimedia / xbmc
View file
xbmc-noX.changes Changed
​x
 
1
@@ -1,4 +1,21 @@
2
 -------------------------------------------------------------------
3
+Sat May 17 12:50:02 UTC 2014 - fisiu@opensuse.org
4
+
5
+- Update to 13.0 Gotham:
6
+  * Dramatic Audio Engine Improvements
7
+  * Improved UPnP capabilities
8
+  * Settings Improvements
9
+  * Making Subtitle Search Better
10
+  * Stereoscopic 3D Rendering
11
+  * Raspberry Pi and Android speed improvements
12
+  * An Extended Python and JSON-RPC API for developers
13
+  * Many minor fixes and improvements
14
+- Add enable-external-ffmpeg.patch: build again system ffmpeg.
15
+- Drop xbmc-12.2-subtitles.patch: fixed upstream.
16
+- Drop samba4-fix.patch: fixed upstream.
17
+- Drop git_rev.patch: fixed upstream.
18
+
19
+-------------------------------------------------------------------
20
 Mon Feb 17 12:21:46 UTC 2014 - guillaume@opensuse.org
21
22
 - Replace raspberrypi-gfx-devel package by raspberrypi-userland-devel
23
​
View file
xbmc.changes Changed
23
 
1
@@ -1,4 +1,21 @@
2
 -------------------------------------------------------------------
3
+Sat May 17 12:50:02 UTC 2014 - fisiu@opensuse.org
4
+
5
+- Update to 13.0 Gotham:
6
+  * Dramatic Audio Engine Improvements
7
+  * Improved UPnP capabilities
8
+  * Settings Improvements
9
+  * Making Subtitle Search Better
10
+  * Stereoscopic 3D Rendering
11
+  * Raspberry Pi and Android speed improvements
12
+  * An Extended Python and JSON-RPC API for developers
13
+  * Many minor fixes and improvements
14
+- Add enable-external-ffmpeg.patch: build again system ffmpeg.
15
+- Drop xbmc-12.2-subtitles.patch: fixed upstream.
16
+- Drop samba4-fix.patch: fixed upstream.
17
+- Drop git_rev.patch: fixed upstream.
18
+
19
+-------------------------------------------------------------------
20
 Mon Feb 17 12:21:46 UTC 2014 - guillaume@opensuse.org
21
22
 - Replace raspberrypi-gfx-devel package by raspberrypi-userland-devel
23
​
View file
xbmc-noX.spec Changed
325
 
1
@@ -4,12 +4,13 @@
2
 # Please edit xbmc.spec and xbmc.changes only. *-noX.* files are generated from xbmc.* files with the pre_checkin.sh script
3
 #
4
5
+
6
 %define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
7
+%define _xbmc_addons_dir %{_datadir}/xbmc/addons
8
9
 %bcond_without enable_rpi_build
10
 %bcond_without enable_rpi_omxplayer
11
12
-Name:           xbmc-noX
13
 # xbmc can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
14
 %define noX_build ("%{name}" == "xbmc-noX")
15
 %if %{noX_build}
16
@@ -17,7 +18,7 @@
17
 %bcond_with enable_opengl
18
 %bcond_without enable_opengles
19
 %else
20
-%ifarch %arm armv6l armv6hl
21
+%ifarch %{arm} armv6l armv6hl
22
 %bcond_with enable_opengl
23
 %bcond_without enable_opengles
24
 %else
25
@@ -25,24 +26,25 @@
26
 %bcond_with enable_opengles
27
 %endif
28
 %endif
29
-Version:        12.3
30
+
31
+Name:           xbmc-noX
32
+Version:        13.0
33
 Release:        0
34
 Summary:        XBMC Media center
35
 License:        GPL-2.0+ and GPL-3.0+
36
 Group:          Productivity/Multimedia/Video/Players
37
 Url:            http://www.xbmc.org/
38
-Source0:        http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
39
-Source1:        https://github.com/opdenkamp/xbmc-pvr-addons/archive/frodo.zip
40
-# PATCH-FIX-UPSTREAM xbmc-12.2-subtitles.patch -- already merged in git rev
41
-Patch0:         xbmc-12.2-subtitles.patch
42
-# PATCH-FIX-UPSTREAM samba4-fix.patch -- Fix path for libsmbclient.h shipped with samba4 -- already in master git.
43
-Patch1:         samba4-fix.patch
44
-Patch2:         git_rev.patch
45
-Patch3:         pvr-addons-enable-all.patch
46
+Source0:        http://mirrors.xbmc.org/releases/source/xbmc-13.0_r2.tar.gz
47
+Source1:        https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz
48
+# PATCH-FEATURE-OPENSUSE -- enable external ffmpeg
49
+Patch0:         enable-external-ffmpeg.patch
50
+# PATCH-FIX-OPENSUSE -- enable all pvr addons
51
+Patch1:         pvr-addons-enable-all.patch
52
 # Raspberry Pi (armv6) only: Fix include path for XBMCTex.cpp:38:25: fatal error: guilib/XBTF.h: No such file or directory
53
-Patch4:         texture.patch
54
+### FIXME Rebase required!
55
+Patch2:         texture.patch
56
 # omxplayer 3D support is only available for non X11 XBMC
57
-Patch5:         disable_omxplayer_3d_support.patch
58
+Patch3:         disable_omxplayer_3d_support.patch
59
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
60
 ExcludeArch:    ppc64
61
 %if %{noX_build}
62
@@ -76,7 +78,7 @@
63
 BuildRequires:  doxygen
64
 BuildRequires:  enca-devel
65
 BuildRequires:  fdupes
66
-BuildRequires:  ffmpeg1-devel
67
+BuildRequires:  libffmpeg-devel
68
 BuildRequires:  flac-devel
69
 BuildRequires:  flex
70
 BuildRequires:  fontconfig-devel
71
@@ -143,7 +145,12 @@
72
 BuildRequires:  sqlite-devel
73
 BuildRequires:  swig
74
 BuildRequires:  tinyxml-devel
75
+BuildRequires:  libxml2-devel
76
+BuildRequires:  libxslt-devel
77
 BuildRequires:  unzip
78
+BuildRequires:  libgnutls-devel
79
+BuildRequires:  bluez-devel
80
+BuildRequires:  libcap-devel
81
 %if !%{noX_build}
82
 BuildRequires:  xorg-x11-devel
83
 %endif
84
@@ -194,19 +201,19 @@
85
 Development files for the XBMC media Center
86
87
 %prep
88
-%setup -q -n xbmc-%{version}-Frodo
89
-%patch0 -p1
90
-%patch2 -p0
91
-%patch3 -p0
92
-%patch4
93
-%if !%{noX_build}
94
-%patch5
95
+%setup -q -n xbmc-%{version}-Gotham_r2
96
+%patch0
97
+%patch1
98
+%ifarch armv6l armv6hl
99
+%if %{with enable_rpi_build}
100
+%patch2
101
 %endif
102
-%if 0%{?suse_version} >= 1310
103
-%patch1 -p0
104
 %endif
105
-unzip -q %{S:1}
106
-mv xbmc-pvr-addons-frodo pvr-addons
107
+%if !%{noX_build}
108
+%patch3
109
+%endif
110
+tar -xf %{SOURCE1}
111
+mv xbmc-pvr-addons-13.0-Gotham pvr-addons
112
 pushd pvr-addons
113
 ./bootstrap
114
 popd
115
@@ -214,25 +221,20 @@
116
 ./bootstrap
117
118
 %build
119
-export CPPFLAGS="-I/usr/include/ffmpeg"
120
-export CFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
121
-export CXXFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
122
-export LDFLAGS="-fPIC"
123
-export LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS"
124
-export ASFLAGS=-fPIC
125
 %ifarch armv6l armv6hl
126
 %if %{with enable_rpi_build}
127
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
128
 %endif
129
 %endif
130
 %configure \
131
---enable-libusb \
132
 --enable-airplay \
133
 --enable-external-libraries \
134
---enable-external-ffmpeg \
135
+--enable-ffmpeg-libvorbis \
136
 --enable-rtmp \
137
 --enable-libbluray \
138
 --disable-debug \
139
+--enable-shared \
140
+--enable-optimizations \
141
 --disable-static \
142
 --enable-libcec \
143
 %if %{with enable_opengl}
144
@@ -269,9 +271,7 @@
145
 make %{?_smp_mflags} VERBOSE=1
146
147
 %install
148
-
149
-rm -rf $RPM_BUILD_ROOT
150
-make DESTDIR=$RPM_BUILD_ROOT install
151
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
152
 # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
153
 rm -r %{buildroot}/%{_datadir}/doc/
154
155
@@ -287,87 +287,102 @@
156
157
 %files
158
 %defattr(-,root,root)
159
-%doc copying.txt  LICENSE.GPL docs/README.linux
160
+%doc copying.txt LICENSE.GPL docs/README.linux
161
 %{_bindir}/xbmc
162
 %{_bindir}/xbmc-standalone
163
 %{_libdir}/xbmc
164
-#%%{_datadir}/xbmc
165
 %{_datadir}/xsessions/XBMC.desktop
166
 %{_datadir}/applications/xbmc.desktop
167
 %{_datadir}/icons/hicolor/*/*/*.png
168
-%{_mandir}/man1/xbmc-standalone.1.gz
169
-%{_mandir}/man1/xbmc.1.gz
170
-
171
 %{_datadir}/xbmc/FEH.py
172
-%{_datadir}/xbmc/addons/metadata.album.universal/*
173
-%{_datadir}/xbmc/addons/metadata.artists.universal/*
174
-%{_datadir}/xbmc/addons/metadata.common.allmusic.com/*
175
-%{_datadir}/xbmc/addons/metadata.common.amazon.de/*
176
-%{_datadir}/xbmc/addons/metadata.common.fanart.tv/*
177
-%{_datadir}/xbmc/addons/metadata.common.hdtrailers.net/*
178
-%{_datadir}/xbmc/addons/metadata.common.htbackdrops.com/*
179
-%{_datadir}/xbmc/addons/metadata.common.imdb.com/*
180
-%{_datadir}/xbmc/addons/metadata.common.last.fm/*
181
-%{_datadir}/xbmc/addons/metadata.common.musicbrainz.org/*
182
-%{_datadir}/xbmc/addons/metadata.common.theaudiodb.com/*
183
-%{_datadir}/xbmc/addons/metadata.common.themoviedb.org/*
184
-%{_datadir}/xbmc/addons/metadata.musicvideos.theaudiodb.com/*
185
-%{_datadir}/xbmc/addons/metadata.themoviedb.org/*
186
-%{_datadir}/xbmc/addons/metadata.tvdb.com/*
187
-%{_datadir}/xbmc/addons/repository.pvr-android.xbmc.org/*
188
-%{_datadir}/xbmc/addons/repository.pvr-ios.xbmc.org/*
189
-%{_datadir}/xbmc/addons/repository.pvr-osx32.xbmc.org/*
190
-%{_datadir}/xbmc/addons/repository.pvr-osx64.xbmc.org/*
191
-%{_datadir}/xbmc/addons/repository.pvr-win32.xbmc.org/*
192
-%{_datadir}/xbmc/addons/repository.xbmc.org/*
193
-%{_datadir}/xbmc/addons/screensaver.rsxs.euphoria/*
194
-%{_datadir}/xbmc/addons/screensaver.rsxs.plasma/*
195
-%{_datadir}/xbmc/addons/screensaver.rsxs.solarwinds/*
196
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.black/*
197
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.dim/*
198
-%{_datadir}/xbmc/addons/script.module.pil/*
199
-%{_datadir}/xbmc/addons/skin.confluence/*
200
-%{_datadir}/xbmc/addons/visualization.dxspectrum/*
201
-%{_datadir}/xbmc/addons/visualization.glspectrum/*
202
-%if %{with enable_opengl}
203
-%{_datadir}/xbmc/addons/visualization.goom/*
204
-%endif
205
-%{_datadir}/xbmc/addons/visualization.milkdrop/*
206
-%{_datadir}/xbmc/addons/visualization.projectm/*
207
-%{_datadir}/xbmc/addons/visualization.waveform/*
208
-%{_datadir}/xbmc/addons/weather.wunderground/*
209
-%{_datadir}/xbmc/addons/webinterface.default/*
210
-%{_datadir}/xbmc/addons/xbmc.addon/*
211
-%{_datadir}/xbmc/addons/xbmc.core/*
212
-%{_datadir}/xbmc/addons/xbmc.gui/*
213
-%{_datadir}/xbmc/addons/xbmc.json/*
214
-%{_datadir}/xbmc/addons/xbmc.metadata/*
215
-%{_datadir}/xbmc/addons/xbmc.pvr/*
216
-%{_datadir}/xbmc/addons/xbmc.python/*
217
-%{_datadir}/xbmc/addons/pvr.argustv/*
218
-%{_datadir}/xbmc/addons/pvr.demo/*
219
-%{_datadir}/xbmc/addons/pvr.dvbviewer/*
220
-%{_datadir}/xbmc/addons/pvr.hts/*
221
-%{_datadir}/xbmc/addons/pvr.iptvsimple/*
222
-%{_datadir}/xbmc/addons/pvr.mediaportal.tvserver/*
223
-%{_datadir}/xbmc/addons/pvr.mythtv.cmyth/*
224
-%{_datadir}/xbmc/addons/pvr.nextpvr/*
225
-%{_datadir}/xbmc/addons/pvr.njoy/*
226
-%{_datadir}/xbmc/addons/pvr.vdr.vnsi/*
227
-%{_datadir}/xbmc/addons/pvr.vuplus/*
228
-%{_datadir}/xbmc/addons/pvr.wmc/*
229
 %{_datadir}/xbmc/language/*
230
 %{_datadir}/xbmc/media/*
231
 %{_datadir}/xbmc/sounds/*
232
 %{_datadir}/xbmc/system/*
233
 %{_datadir}/xbmc/userdata/*
234
+%{_mandir}/man1/xbmc.1.gz
235
+%{_mandir}/man1/xbmc-standalone.1.gz
236
+%{_xbmc_addons_dir}/xbmc.codec/addon.xml
237
+%{_xbmc_addons_dir}/metadata.album.universal/*
238
+%{_xbmc_addons_dir}/metadata.artists.universal/*
239
+%{_xbmc_addons_dir}/metadata.common.allmusic.com/*
240
+%{_xbmc_addons_dir}/metadata.common.amazon.de/*
241
+%{_xbmc_addons_dir}/metadata.common.fanart.tv/*
242
+%{_xbmc_addons_dir}/metadata.common.hdtrailers.net/*
243
+%{_xbmc_addons_dir}/metadata.common.htbackdrops.com/*
244
+%{_xbmc_addons_dir}/metadata.common.imdb.com/*
245
+%{_xbmc_addons_dir}/metadata.common.last.fm/*
246
+%{_xbmc_addons_dir}/metadata.common.musicbrainz.org/*
247
+%{_xbmc_addons_dir}/metadata.common.theaudiodb.com/*
248
+%{_xbmc_addons_dir}/metadata.common.themoviedb.org/*
249
+%{_xbmc_addons_dir}/metadata.local/*
250
+%{_xbmc_addons_dir}/metadata.musicvideos.theaudiodb.com/*
251
+%{_xbmc_addons_dir}/metadata.themoviedb.org/*
252
+%{_xbmc_addons_dir}/metadata.tvdb.com/*
253
+%{_xbmc_addons_dir}/repository.xbmc.org/*
254
+%{_xbmc_addons_dir}/screensaver.rsxs.euphoria/*
255
+%{_xbmc_addons_dir}/screensaver.rsxs.plasma/*
256
+%{_xbmc_addons_dir}/screensaver.rsxs.solarwinds/*
257
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.black/*
258
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.dim/*
259
+%{_xbmc_addons_dir}/script.module.pil/*
260
+%{_xbmc_addons_dir}/service.xbmc.versioncheck/*
261
+%{_xbmc_addons_dir}/skin.confluence/*
262
+%{_xbmc_addons_dir}/visualization.fishbmc/*
263
+%{_xbmc_addons_dir}/visualization.glspectrum/*
264
+%if %{with enable_opengl}
265
+%{_xbmc_addons_dir}/visualization.goom/*
266
+%endif
267
+%{_xbmc_addons_dir}/visualization.projectm/*
268
+%{_xbmc_addons_dir}/visualization.vortex/*
269
+%{_xbmc_addons_dir}/visualization.waveform/*
270
+%{_xbmc_addons_dir}/webinterface.default/*
271
+%{_xbmc_addons_dir}/xbmc.addon/*
272
+%{_xbmc_addons_dir}/xbmc.core/*
273
+%{_xbmc_addons_dir}/xbmc.debug/*
274
+%{_xbmc_addons_dir}/xbmc.gui/*
275
+%{_xbmc_addons_dir}/xbmc.json/*
276
+%{_xbmc_addons_dir}/xbmc.metadata/*
277
+%{_xbmc_addons_dir}/xbmc.pvr/*
278
+%{_xbmc_addons_dir}/xbmc.python/*
279
+%{_xbmc_addons_dir}/pvr.argustv/*
280
+%{_xbmc_addons_dir}/pvr.demo/*
281
+%{_xbmc_addons_dir}/pvr.dvblink/*
282
+%{_xbmc_addons_dir}/pvr.dvbviewer/*
283
+%{_xbmc_addons_dir}/pvr.hts/*
284
+%{_xbmc_addons_dir}/pvr.iptvsimple/*
285
+%{_xbmc_addons_dir}/pvr.mediaportal.tvserver/*
286
+%{_xbmc_addons_dir}/pvr.mythtv.cmyth/*
287
+%{_xbmc_addons_dir}/pvr.nextpvr/*
288
+%{_xbmc_addons_dir}/pvr.njoy/*
289
+%{_xbmc_addons_dir}/pvr.vdr.vnsi/*
290
+%{_xbmc_addons_dir}/pvr.vuplus/*
291
+%{_xbmc_addons_dir}/pvr.wmc/*
292
293
 %files devel
294
 %defattr(-,root,root)
295
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.cpp
296
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.h
297
-%{_datadir}/xbmc/addons/library.xbmc.gui/libXBMC_gui.h
298
-%{_datadir}/xbmc/addons/library.xbmc.addon/libXBMC_addon.h
299
-%{_datadir}/xbmc/addons/library.xbmc.pvr/libXBMC_pvr.h
300
+%{_includedir}/xbmc/DVDDemuxPacket.h
301
+%{_includedir}/xbmc/libXBMC_addon.h
302
+%{_includedir}/xbmc/libXBMC_codec.h
303
+%{_includedir}/xbmc/libXBMC_gui.h
304
+%{_includedir}/xbmc/libXBMC_pvr.h
305
+%{_includedir}/xbmc/xbmc_addon_cpp_dll.h
306
+%{_includedir}/xbmc/xbmc_addon_dll.h
307
+%{_includedir}/xbmc/xbmc_addon_types.h
308
+%{_includedir}/xbmc/xbmc_codec_types.h
309
+%{_includedir}/xbmc/xbmc_epg_types.h
310
+%{_includedir}/xbmc/xbmc_pvr_dll.h
311
+%{_includedir}/xbmc/xbmc_pvr_types.h
312
+%{_includedir}/xbmc/xbmc_scr_dll.h
313
+%{_includedir}/xbmc/xbmc_scr_types.h
314
+%{_includedir}/xbmc/xbmc_stream_utils.hpp
315
+%{_includedir}/xbmc/xbmc_vis_dll.h
316
+%{_includedir}/xbmc/xbmc_vis_types.h
317
+%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.cpp
318
+%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.h
319
+%{_xbmc_addons_dir}/library.xbmc.addon/libXBMC_addon.h
320
+%{_xbmc_addons_dir}/library.xbmc.codec/libXBMC_codec.h
321
+%{_xbmc_addons_dir}/library.xbmc.gui/libXBMC_gui.h
322
+%{_xbmc_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
323
324
 %changelog
325
​
View file
xbmc.spec Changed
336
 
1
@@ -4,12 +4,13 @@
2
 # Please edit xbmc.spec and xbmc.changes only. *-noX.* files are generated from xbmc.* files with the pre_checkin.sh script
3
 #
4
5
+
6
 %define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
7
+%define _xbmc_addons_dir %{_datadir}/xbmc/addons
8
9
 %bcond_without enable_rpi_build
10
 %bcond_without enable_rpi_omxplayer
11
12
-Name:           xbmc
13
 # xbmc can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
14
 %define noX_build ("%{name}" == "xbmc-noX")
15
 %if %{noX_build}
16
@@ -17,7 +18,7 @@
17
 %bcond_with enable_opengl
18
 %bcond_without enable_opengles
19
 %else
20
-%ifarch %arm armv6l armv6hl
21
+%ifarch %{arm} armv6l armv6hl
22
 %bcond_with enable_opengl
23
 %bcond_without enable_opengles
24
 %else
25
@@ -25,24 +26,25 @@
26
 %bcond_with enable_opengles
27
 %endif
28
 %endif
29
-Version:        12.3
30
+
31
+Name:           xbmc
32
+Version:        13.0
33
 Release:        0
34
 Summary:        XBMC Media center
35
 License:        GPL-2.0+ and GPL-3.0+
36
 Group:          Productivity/Multimedia/Video/Players
37
 Url:            http://www.xbmc.org/
38
-Source0:        http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
39
-Source1:        https://github.com/opdenkamp/xbmc-pvr-addons/archive/frodo.zip
40
-# PATCH-FIX-UPSTREAM xbmc-12.2-subtitles.patch -- already merged in git rev
41
-Patch0:         xbmc-12.2-subtitles.patch
42
-# PATCH-FIX-UPSTREAM samba4-fix.patch -- Fix path for libsmbclient.h shipped with samba4 -- already in master git.
43
-Patch1:         samba4-fix.patch
44
-Patch2:         git_rev.patch
45
-Patch3:         pvr-addons-enable-all.patch
46
+Source0:        http://mirrors.xbmc.org/releases/source/xbmc-13.0_r2.tar.gz
47
+Source1:        https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz
48
+# PATCH-FEATURE-OPENSUSE -- enable external ffmpeg
49
+Patch0:         enable-external-ffmpeg.patch
50
+# PATCH-FIX-OPENSUSE -- enable all pvr addons
51
+Patch1:         pvr-addons-enable-all.patch
52
 # Raspberry Pi (armv6) only: Fix include path for XBMCTex.cpp:38:25: fatal error: guilib/XBTF.h: No such file or directory
53
-Patch4:         texture.patch
54
+### FIXME Rebase required!
55
+Patch2:         texture.patch
56
 # omxplayer 3D support is only available for non X11 XBMC
57
-Patch5:         disable_omxplayer_3d_support.patch
58
+Patch3:         disable_omxplayer_3d_support.patch
59
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
60
 ExcludeArch:    ppc64
61
 %if %{noX_build}
62
@@ -76,7 +78,7 @@
63
 BuildRequires:  doxygen
64
 BuildRequires:  enca-devel
65
 BuildRequires:  fdupes
66
-BuildRequires:  ffmpeg1-devel
67
+BuildRequires:  libffmpeg-devel
68
 BuildRequires:  flac-devel
69
 BuildRequires:  flex
70
 BuildRequires:  fontconfig-devel
71
@@ -143,7 +145,12 @@
72
 BuildRequires:  sqlite-devel
73
 BuildRequires:  swig
74
 BuildRequires:  tinyxml-devel
75
+BuildRequires:  libxml2-devel
76
+BuildRequires:  libxslt-devel
77
 BuildRequires:  unzip
78
+BuildRequires:  libgnutls-devel
79
+BuildRequires:  bluez-devel
80
+BuildRequires:  libcap-devel
81
 %if !%{noX_build}
82
 BuildRequires:  xorg-x11-devel
83
 %endif
84
@@ -194,19 +201,19 @@
85
 Development files for the XBMC media Center
86
87
 %prep
88
-%setup -q -n xbmc-%{version}-Frodo
89
-%patch0 -p1
90
-%patch2 -p0
91
-%patch3 -p0
92
-%patch4
93
-%if !%{noX_build}
94
-%patch5
95
+%setup -q -n xbmc-%{version}-Gotham_r2
96
+%patch0
97
+%patch1
98
+%ifarch armv6l armv6hl
99
+%if %{with enable_rpi_build}
100
+%patch2
101
+%endif
102
 %endif
103
-%if 0%{?suse_version} >= 1310
104
-%patch1 -p0
105
+%if !%{noX_build}
106
+%patch3
107
 %endif
108
-unzip -q %{S:1}
109
-mv xbmc-pvr-addons-frodo pvr-addons
110
+tar -xf %{SOURCE1}
111
+mv xbmc-pvr-addons-13.0-Gotham pvr-addons
112
 pushd pvr-addons
113
 ./bootstrap
114
 popd
115
@@ -214,25 +221,20 @@
116
 ./bootstrap
117
118
 %build
119
-export CPPFLAGS="-I/usr/include/ffmpeg"
120
-export CFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
121
-export CXXFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
122
-export LDFLAGS="-fPIC"
123
-export LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS"
124
-export ASFLAGS=-fPIC
125
 %ifarch armv6l armv6hl
126
 %if %{with enable_rpi_build}
127
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
128
 %endif
129
 %endif
130
 %configure \
131
---enable-libusb \
132
 --enable-airplay \
133
 --enable-external-libraries \
134
---enable-external-ffmpeg \
135
+--enable-ffmpeg-libvorbis \
136
 --enable-rtmp \
137
 --enable-libbluray \
138
 --disable-debug \
139
+--enable-shared \
140
+--enable-optimizations \
141
 --disable-static \
142
 --enable-libcec \
143
 %if %{with enable_opengl}
144
@@ -269,9 +271,7 @@
145
 make %{?_smp_mflags} VERBOSE=1
146
147
 %install
148
-
149
-rm -rf $RPM_BUILD_ROOT
150
-make DESTDIR=$RPM_BUILD_ROOT install
151
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
152
 # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
153
 rm -r %{buildroot}/%{_datadir}/doc/
154
155
@@ -279,6 +279,16 @@
156
 install -m 644 -D docs/manpages/xbmc-standalone.1 %{buildroot}%{_mandir}/man1/xbmc-standalone.1
157
 install -m 644 -D docs/manpages/xbmc.bin.1 %{buildroot}%{_mandir}/man1/xbmc.1
158
159
+# remove win32 source files
160
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.cpp
161
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.h
162
+
163
+# remove duplicate header files
164
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/libXBMC_addon.h
165
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.codec/libXBMC_codec.h
166
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.gui/libXBMC_gui.h
167
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
168
+
169
 desktop-file-install \
170
  --dir=%{buildroot}%{_datadir}/applications \
171
  %{buildroot}%{_datadir}/applications/xbmc.desktop
172
@@ -287,87 +297,96 @@
173
174
 %files
175
 %defattr(-,root,root)
176
-%doc copying.txt  LICENSE.GPL docs/README.linux
177
+%doc copying.txt LICENSE.GPL docs/README.linux
178
 %{_bindir}/xbmc
179
 %{_bindir}/xbmc-standalone
180
 %{_libdir}/xbmc
181
-#%%{_datadir}/xbmc
182
 %{_datadir}/xsessions/XBMC.desktop
183
 %{_datadir}/applications/xbmc.desktop
184
 %{_datadir}/icons/hicolor/*/*/*.png
185
-%{_mandir}/man1/xbmc-standalone.1.gz
186
-%{_mandir}/man1/xbmc.1.gz
187
-
188
 %{_datadir}/xbmc/FEH.py
189
-%{_datadir}/xbmc/addons/metadata.album.universal/*
190
-%{_datadir}/xbmc/addons/metadata.artists.universal/*
191
-%{_datadir}/xbmc/addons/metadata.common.allmusic.com/*
192
-%{_datadir}/xbmc/addons/metadata.common.amazon.de/*
193
-%{_datadir}/xbmc/addons/metadata.common.fanart.tv/*
194
-%{_datadir}/xbmc/addons/metadata.common.hdtrailers.net/*
195
-%{_datadir}/xbmc/addons/metadata.common.htbackdrops.com/*
196
-%{_datadir}/xbmc/addons/metadata.common.imdb.com/*
197
-%{_datadir}/xbmc/addons/metadata.common.last.fm/*
198
-%{_datadir}/xbmc/addons/metadata.common.musicbrainz.org/*
199
-%{_datadir}/xbmc/addons/metadata.common.theaudiodb.com/*
200
-%{_datadir}/xbmc/addons/metadata.common.themoviedb.org/*
201
-%{_datadir}/xbmc/addons/metadata.musicvideos.theaudiodb.com/*
202
-%{_datadir}/xbmc/addons/metadata.themoviedb.org/*
203
-%{_datadir}/xbmc/addons/metadata.tvdb.com/*
204
-%{_datadir}/xbmc/addons/repository.pvr-android.xbmc.org/*
205
-%{_datadir}/xbmc/addons/repository.pvr-ios.xbmc.org/*
206
-%{_datadir}/xbmc/addons/repository.pvr-osx32.xbmc.org/*
207
-%{_datadir}/xbmc/addons/repository.pvr-osx64.xbmc.org/*
208
-%{_datadir}/xbmc/addons/repository.pvr-win32.xbmc.org/*
209
-%{_datadir}/xbmc/addons/repository.xbmc.org/*
210
-%{_datadir}/xbmc/addons/screensaver.rsxs.euphoria/*
211
-%{_datadir}/xbmc/addons/screensaver.rsxs.plasma/*
212
-%{_datadir}/xbmc/addons/screensaver.rsxs.solarwinds/*
213
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.black/*
214
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.dim/*
215
-%{_datadir}/xbmc/addons/script.module.pil/*
216
-%{_datadir}/xbmc/addons/skin.confluence/*
217
-%{_datadir}/xbmc/addons/visualization.dxspectrum/*
218
-%{_datadir}/xbmc/addons/visualization.glspectrum/*
219
-%if %{with enable_opengl}
220
-%{_datadir}/xbmc/addons/visualization.goom/*
221
-%endif
222
-%{_datadir}/xbmc/addons/visualization.milkdrop/*
223
-%{_datadir}/xbmc/addons/visualization.projectm/*
224
-%{_datadir}/xbmc/addons/visualization.waveform/*
225
-%{_datadir}/xbmc/addons/weather.wunderground/*
226
-%{_datadir}/xbmc/addons/webinterface.default/*
227
-%{_datadir}/xbmc/addons/xbmc.addon/*
228
-%{_datadir}/xbmc/addons/xbmc.core/*
229
-%{_datadir}/xbmc/addons/xbmc.gui/*
230
-%{_datadir}/xbmc/addons/xbmc.json/*
231
-%{_datadir}/xbmc/addons/xbmc.metadata/*
232
-%{_datadir}/xbmc/addons/xbmc.pvr/*
233
-%{_datadir}/xbmc/addons/xbmc.python/*
234
-%{_datadir}/xbmc/addons/pvr.argustv/*
235
-%{_datadir}/xbmc/addons/pvr.demo/*
236
-%{_datadir}/xbmc/addons/pvr.dvbviewer/*
237
-%{_datadir}/xbmc/addons/pvr.hts/*
238
-%{_datadir}/xbmc/addons/pvr.iptvsimple/*
239
-%{_datadir}/xbmc/addons/pvr.mediaportal.tvserver/*
240
-%{_datadir}/xbmc/addons/pvr.mythtv.cmyth/*
241
-%{_datadir}/xbmc/addons/pvr.nextpvr/*
242
-%{_datadir}/xbmc/addons/pvr.njoy/*
243
-%{_datadir}/xbmc/addons/pvr.vdr.vnsi/*
244
-%{_datadir}/xbmc/addons/pvr.vuplus/*
245
-%{_datadir}/xbmc/addons/pvr.wmc/*
246
 %{_datadir}/xbmc/language/*
247
 %{_datadir}/xbmc/media/*
248
 %{_datadir}/xbmc/sounds/*
249
 %{_datadir}/xbmc/system/*
250
 %{_datadir}/xbmc/userdata/*
251
+%{_mandir}/man1/xbmc.1.gz
252
+%{_mandir}/man1/xbmc-standalone.1.gz
253
+%{_xbmc_addons_dir}/xbmc.codec/addon.xml
254
+%{_xbmc_addons_dir}/metadata.album.universal/*
255
+%{_xbmc_addons_dir}/metadata.artists.universal/*
256
+%{_xbmc_addons_dir}/metadata.common.allmusic.com/*
257
+%{_xbmc_addons_dir}/metadata.common.amazon.de/*
258
+%{_xbmc_addons_dir}/metadata.common.fanart.tv/*
259
+%{_xbmc_addons_dir}/metadata.common.hdtrailers.net/*
260
+%{_xbmc_addons_dir}/metadata.common.htbackdrops.com/*
261
+%{_xbmc_addons_dir}/metadata.common.imdb.com/*
262
+%{_xbmc_addons_dir}/metadata.common.last.fm/*
263
+%{_xbmc_addons_dir}/metadata.common.musicbrainz.org/*
264
+%{_xbmc_addons_dir}/metadata.common.theaudiodb.com/*
265
+%{_xbmc_addons_dir}/metadata.common.themoviedb.org/*
266
+%{_xbmc_addons_dir}/metadata.local/*
267
+%{_xbmc_addons_dir}/metadata.musicvideos.theaudiodb.com/*
268
+%{_xbmc_addons_dir}/metadata.themoviedb.org/*
269
+%{_xbmc_addons_dir}/metadata.tvdb.com/*
270
+%{_xbmc_addons_dir}/repository.xbmc.org/*
271
+%{_xbmc_addons_dir}/screensaver.rsxs.euphoria/*
272
+%{_xbmc_addons_dir}/screensaver.rsxs.plasma/*
273
+%{_xbmc_addons_dir}/screensaver.rsxs.solarwinds/*
274
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.black/*
275
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.dim/*
276
+%{_xbmc_addons_dir}/script.module.pil/*
277
+%{_xbmc_addons_dir}/service.xbmc.versioncheck/*
278
+%{_xbmc_addons_dir}/skin.confluence/*
279
+%{_xbmc_addons_dir}/visualization.fishbmc/*
280
+%{_xbmc_addons_dir}/visualization.glspectrum/*
281
+%if %{with enable_opengl}
282
+%{_xbmc_addons_dir}/visualization.goom/*
283
+%endif
284
+%{_xbmc_addons_dir}/visualization.projectm/*
285
+%{_xbmc_addons_dir}/visualization.vortex/*
286
+%{_xbmc_addons_dir}/visualization.waveform/*
287
+%{_xbmc_addons_dir}/webinterface.default/*
288
+%{_xbmc_addons_dir}/xbmc.addon/*
289
+%{_xbmc_addons_dir}/xbmc.core/*
290
+%{_xbmc_addons_dir}/xbmc.debug/*
291
+%{_xbmc_addons_dir}/xbmc.gui/*
292
+%{_xbmc_addons_dir}/xbmc.json/*
293
+%{_xbmc_addons_dir}/xbmc.metadata/*
294
+%{_xbmc_addons_dir}/xbmc.pvr/*
295
+%{_xbmc_addons_dir}/xbmc.python/*
296
+%{_xbmc_addons_dir}/pvr.argustv/*
297
+%{_xbmc_addons_dir}/pvr.demo/*
298
+%{_xbmc_addons_dir}/pvr.dvblink/*
299
+%{_xbmc_addons_dir}/pvr.dvbviewer/*
300
+%{_xbmc_addons_dir}/pvr.hts/*
301
+%{_xbmc_addons_dir}/pvr.iptvsimple/*
302
+%{_xbmc_addons_dir}/pvr.mediaportal.tvserver/*
303
+%{_xbmc_addons_dir}/pvr.mythtv.cmyth/*
304
+%{_xbmc_addons_dir}/pvr.nextpvr/*
305
+%{_xbmc_addons_dir}/pvr.njoy/*
306
+%{_xbmc_addons_dir}/pvr.vdr.vnsi/*
307
+%{_xbmc_addons_dir}/pvr.vuplus/*
308
+%{_xbmc_addons_dir}/pvr.wmc/*
309
310
 %files devel
311
 %defattr(-,root,root)
312
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.cpp
313
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.h
314
-%{_datadir}/xbmc/addons/library.xbmc.gui/libXBMC_gui.h
315
-%{_datadir}/xbmc/addons/library.xbmc.addon/libXBMC_addon.h
316
-%{_datadir}/xbmc/addons/library.xbmc.pvr/libXBMC_pvr.h
317
+%{_includedir}/xbmc/DVDDemuxPacket.h
318
+%{_includedir}/xbmc/libXBMC_addon.h
319
+%{_includedir}/xbmc/libXBMC_codec.h
320
+%{_includedir}/xbmc/libXBMC_gui.h
321
+%{_includedir}/xbmc/libXBMC_pvr.h
322
+%{_includedir}/xbmc/xbmc_addon_cpp_dll.h
323
+%{_includedir}/xbmc/xbmc_addon_dll.h
324
+%{_includedir}/xbmc/xbmc_addon_types.h
325
+%{_includedir}/xbmc/xbmc_codec_types.h
326
+%{_includedir}/xbmc/xbmc_epg_types.h
327
+%{_includedir}/xbmc/xbmc_pvr_dll.h
328
+%{_includedir}/xbmc/xbmc_pvr_types.h
329
+%{_includedir}/xbmc/xbmc_scr_dll.h
330
+%{_includedir}/xbmc/xbmc_scr_types.h
331
+%{_includedir}/xbmc/xbmc_stream_utils.hpp
332
+%{_includedir}/xbmc/xbmc_vis_dll.h
333
+%{_includedir}/xbmc/xbmc_vis_types.h
334
335
 %changelog
336
​
View file
disable_omxplayer_3d_support.patch Changed
33
 
1
@@ -1,18 +1,20 @@
2
---- ./xbmc/cores/omxplayer/OMXPlayerVideo.cpp.orig 2013-10-02 20:25:58.342026870 +0200
3
-+++ ./xbmc/cores/omxplayer/OMXPlayerVideo.cpp  2013-10-02 20:26:53.703458220 +0200
4
-@@ -765,6 +765,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
5
-     m_bAllowFullscreen = false; // only allow on first configure
6
-   }
7
+Index: xbmc/cores/omxplayer/OMXPlayerVideo.cpp
8
+===================================================================
9
+--- xbmc/cores/omxplayer/OMXPlayerVideo.cpp.orig
10
++++ xbmc/cores/omxplayer/OMXPlayerVideo.cpp
11
+@@ -721,6 +721,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
12
+
13
+   flags |= GetStereoModeFlags(GetStereoMode());
14
15
 +  #if 0
16
-   if(m_flags & CONF_FLAGS_FORMAT_SBS)
17
+   if(flags & CONF_FLAGS_STEREO_MODE_SBS)
18
    {
19
      if(g_Windowing.Support3D(video_width, video_height, D3DPRESENTFLAG_MODE3DSBS))
20
-@@ -781,6 +782,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
21
-       flags |= CONF_FLAGS_FORMAT_TB;
22
-     }
23
-   }
24
-+#endif
25
+@@ -744,6 +745,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
26
+   else
27
+     CLog::Log(LOGNOTICE, "not a 3D movie");
28
29
++  #endif
30
    unsigned int iDisplayWidth  = width;
31
    unsigned int iDisplayHeight = height;
32
+
33
​
View file
enable-external-ffmpeg.patch Added
105
 
1
@@ -0,0 +1,103 @@
2
+Index: configure.in
3
+===================================================================
4
+--- configure.in.orig
5
++++ configure.in
6
+@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
7
+ MAKE="${MAKE:-make}"
8
+ OBJDUMP="${OBJDUMP:-objdump}"
9
+
10
+-use_external_ffmpeg=no
11
++use_external_ffmpeg=yes
12
+ use_static_ffmpeg=no
13
+
14
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
15
+@@ -632,7 +632,7 @@ case $host in
16
+         use_arch="x86"
17
+         use_cpu="i686"
18
+      fi
19
+-     use_static_ffmpeg=yes
20
++     use_static_ffmpeg=no
21
+      ;;
22
+   x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
23
+      ARCH="x86_64-linux"
24
+@@ -640,7 +640,7 @@ case $host in
25
+         use_arch="x86_64"
26
+         use_cpu="x86_64"
27
+      fi
28
+-     use_static_ffmpeg=yes
29
++     use_static_ffmpeg=no
30
+      ;;
31
+   i386-*-freebsd*)
32
+      ARCH="x86-freebsd"
33
+@@ -696,7 +696,7 @@ case $host in
34
+      use_sdl=no
35
+      use_x11=no
36
+      use_wayland=no
37
+-     use_static_ffmpeg=yes
38
++     use_static_ffmpeg=no
39
+      ;;
40
+   arm*-*linux-android*)
41
+      target_platform=target_android
42
+Index: lib/DllAvCodec.h
43
+===================================================================
44
+--- lib/DllAvCodec.h.orig
45
++++ lib/DllAvCodec.h
46
+@@ -43,6 +43,7 @@ extern "C" {
47
+
48
+ #if (defined USE_EXTERNAL_FFMPEG)
49
+   #include <libavcodec/avcodec.h>
50
++  #include <libavutil/frame.h>
51
+ #else
52
+   #include "libavcodec/avcodec.h"
53
+ #endif
54
+Index: lib/DllAvUtil.h
55
+===================================================================
56
+--- lib/DllAvUtil.h.orig
57
++++ lib/DllAvUtil.h
58
+@@ -31,33 +31,19 @@
59
+ #endif
60
+
61
+ extern "C" {
62
+-#if (defined USE_EXTERNAL_FFMPEG)
63
+-  #include <libavutil/avutil.h>
64
+-  // for av_get_default_channel_layout
65
+-  #include <libavutil/audioconvert.h>
66
+-  #include <libavutil/crc.h>
67
+-  #include <libavutil/fifo.h>
68
+-  // for LIBAVCODEC_VERSION_INT:
69
+-  #include <libavcodec/avcodec.h>
70
+-  // for enum AVSampleFormat
71
+-  #include <libavutil/samplefmt.h>
72
+-  #include <libavutil/opt.h>
73
+-  #include <libavutil/mem.h>
74
+-  #include <libavutil/mathematics.h>
75
+-  #if (defined USE_LIBAV_HACKS)
76
+-    #include "xbmc-libav-hacks/libav_hacks.h"
77
+-  #endif
78
+-#else
79
+-  #include "libavutil/avutil.h"
80
+-  //for av_get_default_channel_layout
81
+-  #include "libavutil/audioconvert.h"
82
+-  #include "libavutil/crc.h"
83
+-  #include "libavutil/opt.h"
84
+-  #include "libavutil/mem.h"
85
+-  #include "libavutil/fifo.h"
86
+-  // for enum AVSampleFormat
87
+-  #include "libavutil/samplefmt.h"
88
+-#endif
89
++#include <libavutil/avutil.h>
90
++#include <libavutil/frame.h>
91
++// for av_get_default_channel_layout
92
++#include <libavutil/audioconvert.h>
93
++#include <libavutil/crc.h>
94
++#include <libavutil/fifo.h>
95
++// for LIBAVCODEC_VERSION_INT:
96
++#include <libavcodec/avcodec.h>
97
++// for enum AVSampleFormat
98
++#include <libavutil/samplefmt.h>
99
++#include <libavutil/opt.h>
100
++#include <libavutil/mem.h>
101
++#include <libavutil/mathematics.h>
102
+ }
103
+
104
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
105
​
View file
git_rev.patch Deleted
15
 
1
@@ -1,13 +0,0 @@
2
---- configure.in   2013-05-03 08:57:40.000000000 +0300
3
-+++ configure.in.gitrev    2013-09-14 20:48:46.869716968 +0300
4
-@@ -2113,6 +2113,10 @@
5
- if test "$GIT_REV" = ""; then
6
-   GIT_REV="Unknown"
7
- fi
8
-+if test -e VERSION; then
9
-+  FULL_GIT_REV=$(cat VERSION | tail -1 )
10
-+  GIT_REV=${FULL_GIT_REV:0:7}
11
-+fi
12
- if test "$host_vendor" = "apple"; then
13
-   echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
14
- else
15
​
View file
pvr-addons-enable-all.patch Changed
18
 
1
@@ -1,10 +1,12 @@
2
---- configure.in   2013-05-03 08:57:40.000000000 +0300
3
-+++ configure.in.pvr-addons    2013-09-16 09:38:01.238313554 +0300
4
-@@ -2745,6 +2745,7 @@
5
+Index: configure.in
6
+===================================================================
7
+--- configure.in.orig
8
++++ configure.in
9
+@@ -2991,6 +2991,7 @@ XB_CONFIG_MODULE([pvr-addons], [
10
      --host=$host_alias \
11
      --build=$build_alias \
12
      --target=$target_alias \
13
 +    --enable-addons-with-dependencies \
14
-     $PVR_EXT_FFMPEG \
15
      CC="$CC" \
16
      CXX="$CXX" \
17
+     CFLAGS="$CFLAGS" \
18
​
View file
samba4-fix.patch Deleted
28
 
1
@@ -1,26 +0,0 @@
2
-Index: xbmc/filesystem/SMBDirectory.cpp
3
-===================================================================
4
---- xbmc/filesystem/SMBDirectory.cpp.orig
5
-+++ xbmc/filesystem/SMBDirectory.cpp
6
-@@ -44,7 +44,7 @@
7
- #include "threads/SingleLock.h"
8
- #include "PasswordManager.h"
9
-
10
--#include <libsmbclient.h>
11
-+#include <samba-4.0/libsmbclient.h>
12
-
13
- #if defined(TARGET_DARWIN)
14
- #define XBMC_SMB_MOUNT_PATH "Library/Application Support/XBMC/Mounts/"
15
-Index: xbmc/filesystem/SmbFile.cpp
16
-===================================================================
17
---- xbmc/filesystem/SmbFile.cpp.orig
18
-+++ xbmc/filesystem/SmbFile.cpp
19
-@@ -27,7 +27,7 @@
20
- #include "PasswordManager.h"
21
- #include "SMBDirectory.h"
22
- #include "Util.h"
23
--#include <libsmbclient.h>
24
-+#include <samba-4.0/libsmbclient.h>
25
- #include "settings/AdvancedSettings.h"
26
- #include "settings/GUISettings.h"
27
- #include "threads/SingleLock.h"
28
​
View file
xbmc-12.2-subtitles.patch Deleted
68
 
1
@@ -1,66 +0,0 @@
2
---- a/lib/DllAvCodec.h 2013-05-02 16:46:47.000000000 +0200
3
-+++ b/lib/DllAvCodec.h 2013-05-16 02:01:26.940819415 +0200
4
-@@ -63,6 +63,12 @@
5
- #endif
6
- }
7
-
8
-+#if LIBAVCODEC_VERSION_MICRO >= 100
9
-+  #define LIBAVCODEC_FROM_FFMPEG
10
-+#else
11
-+  #define LIBAVCODEC_FROM_LIBAV
12
-+#endif
13
-+
14
- #include "threads/SingleLock.h"
15
-
16
- class DllAvCodecInterface
17
---- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp   2013-05-02 16:46:47.000000000 +0200
18
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp   2013-05-16 02:05:08.899391141 +0200
19
-@@ -26,7 +26,9 @@
20
- #include "Audio/DVDAudioCodec.h"
21
- #include "Overlay/DVDOverlayCodec.h"
22
-
23
-+#if defined(HAVE_LIBVDADECODER)
24
- #include "Video/DVDVideoCodecVDA.h"
25
-+#endif
26
- #if defined(HAVE_VIDEOTOOLBOXDECODER)
27
- #include "Video/DVDVideoCodecVideoToolBox.h"
28
- #endif
29
-@@ -346,6 +348,12 @@
30
-   switch (hint.codec)
31
-   {
32
-     case CODEC_ID_TEXT:
33
-+#if defined(LIBAVCODEC_FROM_FFMPEG) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,53,100)
34
-+    // API changed in:
35
-+    // ffmpeg: commit 2626cc4580bfd560c6983338d77b2c11c16af94f (11 Aug 2012)
36
-+    //         release 1.0 (28 Sept 2012)
37
-+    case AV_CODEC_ID_SUBRIP:
38
-+#endif
39
-       pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
40
-       if( pCodec ) return pCodec;
41
-       break;
42
---- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp   2013-05-02 16:46:47.000000000 +0200
43
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp   2013-05-16 02:07:43.197469670 +0200
44
-@@ -44,6 +44,13 @@
45
-   m_bIsSSA = (hints.codec == CODEC_ID_SSA);
46
-   if(hints.codec == CODEC_ID_TEXT || hints.codec == CODEC_ID_SSA)
47
-     return true;
48
-+#if defined(LIBAVCODEC_FROM_FFMPEG) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,53,100)
49
-+  // API changed in:
50
-+  // ffmpeg: commit 2626cc4580bfd560c6983338d77b2c11c16af94f (11 Aug 2012)
51
-+  //         release 1.0 (28 Sept 2012)
52
-+  if(hints.codec == AV_CODEC_ID_SUBRIP)
53
-+    return true;
54
-+#endif
55
-   return false;
56
- }
57
-
58
---- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h 2013-05-02 16:46:47.000000000 +0200
59
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h 2013-05-16 02:08:34.419827631 +0200
60
-@@ -21,6 +21,7 @@
61
-  */
62
-
63
- #include "DVDOverlayCodec.h"
64
-+#include "DllAvCodec.h"
65
-
66
- class CDVDOverlayText;
67
-
68
​
Refresh

No build results available

Refresh

No rpmlint results available

Peter Linnell

mrdocs wrote almost 11 years ago

ok, Thanks

Request History
Mariusz Fik's avatar

Fisiu created request almost 11 years ago

- Update to 13.0 Gotham:
* Dramatic Audio Engine Improvements
* Improved UPnP capabilities
* Settings Improvements
* Making Subtitle Search Better
* Stereoscopic 3D Rendering
* Raspberry Pi and Android speed improvements
* An Extended Python and JSON-RPC API for developers
* Many minor fixes and improvements
- Add enable-external-ffmpeg.patch: build again system ffmpeg.
- Drop xbmc-12.2-subtitles.patch: fixed upstream.
- Drop samba4-fix.patch: fixed upstream.
- Drop git_rev.patch: fixed upstream.

Peter Linnell's avatar

mrdocs accepted request almost 11 years ago

Please add a comment

Locations
Help
Contact