Overview
Submit package home:Bochi:branches:Multimedia / xbmc to package Multimedia / xbmc
xbmc.spec
Changed
x
1
2
URL: http://www.xbmc.org/
3
Release: 1
4
Source0: http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
5
-
6
+Patch0: xbmc-12.2.patch
7
ExcludeArch: ppc64
8
Buildroot: %{_tmppath}/%{name}-%{version}
9
Summary: Media center
10
11
forecast functions, together third-party plugins.
12
13
%prep
14
-
15
%setup -q -n %{name}-%{version}
16
17
+%if 0%{?suse_version} >= 1220
18
+%patch0 -p1
19
+%endif
20
+
21
%build
22
23
chmod +x bootstrap
24
xbmc-12.2.patch
Added
79
1
2
+diff -Naur a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
3
+--- a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-03-21 23:07:50.000000000 +0100
4
++++ b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-09-18 10:09:22.725236390 +0200
5
+@@ -34,6 +34,12 @@
6
+ using namespace CDDB;
7
+ #endif
8
+
9
++#if defined (LIBCDIO_VERSION_NUM) && (LIBCDIO_VERSION_NUM > 83)
10
++#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
11
++#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
12
++#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
13
++#endif
14
++
15
+ CMusicInfoTagLoaderCDDA::CMusicInfoTagLoaderCDDA(void)
16
+ {
17
+ }
18
+diff -Naur a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
19
+--- a/xbmc/storage/cdioSupport.cpp 2012-03-21 23:07:50.000000000 +0100
20
++++ b/xbmc/storage/cdioSupport.cpp 2012-09-18 10:09:57.149043514 +0200
21
+@@ -648,7 +648,21 @@
22
+ CSingleLock lock(*m_cdio);
23
+
24
+ // Get the CD-Text , if any
25
+- cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
26
++#if defined (LIBCDIO_VERSION_NUM) && (LIBCDIO_VERSION_NUM > 83)
27
++ cdtext_t *pcdtext = static_cast<cdtext_t*>( cdio_get_cdtext(cdio) );
28
++
29
++ if (pcdtext != NULL)
30
++ {
31
++ for (int i=0; i < MAX_CDTEXT_FIELDS; i++)
32
++ {
33
++ if (cdtext_get_const(pcdtext, (cdtext_field_t)i, trackNum))
34
++ {
35
++ xcdt(cdtext_field_t)i = cdtext_field2str((cdtext_field_t)i);
36
++ }
37
++ }
38
++ }
39
++#else
40
++ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
41
+
42
+ if (pcdtext == NULL)
43
+ return ;
44
+@@ -657,6 +671,7 @@
45
+ for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
46
+ if (pcdtext->fieldi)
47
+ xcdt(cdtext_field_t)i = pcdtext->field(cdtext_field_t)i;
48
++#endif
49
+ }
50
+
51
+ CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)
52
+@@ -681,7 +696,7 @@
53
+ m_nFirstTrackNum = ::cdio_get_first_track_num(cdio);
54
+ if (m_nFirstTrackNum == CDIO_INVALID_TRACK)
55
+ {
56
+-#ifndef __APPLE__
57
++#if !defined(TARGET_DARWIN)
58
+ ::cdio_destroy(cdio);
59
+ return NULL;
60
+ #else
61
+@@ -693,7 +708,7 @@
62
+ m_nNumTracks = ::cdio_get_num_tracks(cdio);
63
+ if (m_nNumTracks == CDIO_INVALID_TRACK)
64
+ {
65
+-#ifndef __APPLE__
66
++#if !defined(TARGET_DARWIN)
67
+ ::cdio_destroy(cdio);
68
+ return NULL;
69
+ #else
70
+@@ -850,6 +865,8 @@
71
+ ti.isofs_size = m_nIsofsSize;
72
+ ti.nJolietLevel = m_nJolietLevel;
73
+ ti.nFrames = ::cdio_get_track_lba(cdio, i);
74
++ ti.nMins = 0;
75
++ ti.nSecs = 0;
76
+ info->SetDiscLabel(m_strDiscLabel);
77
+
78
+
79
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
Bochi created request over 11 years ago
Fix XBMC build on 12.2
mrdocs accepted request over 12 years ago
Reviewed OK