Request 280 (accepted)

Overview

Request 280 (accepted)

Fix XBMC build on 12.2

Created by Bochi over 11 years ago
In state accepted

Submit xbmc

Submit package home:Bochi:branches:Multimedia / xbmc to package Multimedia / xbmc

xbmc.spec Changed

xbmc-12.2.patch Added

@@ -0,0 +1,77 @@
+diff -Naur a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
+--- a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-03-21 23:07:50.000000000 +0100
++++ b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-09-18 10:09:22.725236390 +0200
+@@ -34,6 +34,12 @@
+ using namespace CDDB;
+ #endif
+ 
++#if defined (LIBCDIO_VERSION_NUM) && (LIBCDIO_VERSION_NUM > 83)
++#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
++#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
++#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
++#endif
++
+ CMusicInfoTagLoaderCDDA::CMusicInfoTagLoaderCDDA(void)
+ {
+ }
+diff -Naur a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
+--- a/xbmc/storage/cdioSupport.cpp	2012-03-21 23:07:50.000000000 +0100
++++ b/xbmc/storage/cdioSupport.cpp	2012-09-18 10:09:57.149043514 +0200
+@@ -648,7 +648,21 @@
+   CSingleLock lock(*m_cdio);
+ 
+   // Get the CD-Text , if any
+-  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
++#if defined (LIBCDIO_VERSION_NUM) && (LIBCDIO_VERSION_NUM > 83)
++  cdtext_t *pcdtext = static_cast<cdtext_t*>( cdio_get_cdtext(cdio) );
++
++  if (pcdtext != NULL)
++  {
++    for (int i=0; i < MAX_CDTEXT_FIELDS; i++) 
++    {
++      if (cdtext_get_const(pcdtext, (cdtext_field_t)i, trackNum))
++      {
++        xcdt(cdtext_field_t)i = cdtext_field2str((cdtext_field_t)i);
++      }
++    }
++  }
++#else
++ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
+ 
+   if (pcdtext == NULL)
+     return ;
+@@ -657,6 +671,7 @@
+   for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
+     if (pcdtext->fieldi)
+       xcdt(cdtext_field_t)i = pcdtext->field(cdtext_field_t)i;
++#endif
+ }
+ 
+ CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)
+@@ -681,7 +696,7 @@
+   m_nFirstTrackNum = ::cdio_get_first_track_num(cdio);
+   if (m_nFirstTrackNum == CDIO_INVALID_TRACK)
+   {
+-#ifndef __APPLE__
++#if !defined(TARGET_DARWIN)
+     ::cdio_destroy(cdio);
+     return NULL;
+ #else
+@@ -693,7 +708,7 @@
+   m_nNumTracks = ::cdio_get_num_tracks(cdio);
+   if (m_nNumTracks == CDIO_INVALID_TRACK)
+   {
+-#ifndef __APPLE__
++#if !defined(TARGET_DARWIN)
+     ::cdio_destroy(cdio);
+     return NULL;
+ #else
+@@ -850,6 +865,8 @@
+       ti.isofs_size = m_nIsofsSize;
+       ti.nJolietLevel = m_nJolietLevel;
+       ti.nFrames = ::cdio_get_track_lba(cdio, i);
++      ti.nMins = 0;
++      ti.nSecs = 0;
+       info->SetDiscLabel(m_strDiscLabel);
+ 
+

Build Results
RPM Lint

Refresh

Comments for request 280 0

Request History

Bochi created request over 11 years ago

Fix XBMC build on 12.2

mrdocs accepted request about 12 years ago

Reviewed OK