Wed Jan 16 00:05:27 PST 2013

3 files changed, 53 insertions, 10 deletions

diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index eb99ea59c..68aa6f7ed 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79508 2012-11-06 11:41:31Z spupykin $
+# $Id: PKGBUILD 82338 2013-01-15 11:35:10Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,7 +9,7 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=11.0
-pkgrel=13
+pkgrel=14
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -32,13 +32,11 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'xorg-xinit: autostart xbmc')
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b')
+	"xbmc.service"
+	"cdio.patch")
+md5sums=('9e8a26ee25173c7268abea7f1d82d428'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5'
+         '49c0a7cbfca3666a24e8824950bd371b')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -46,6 +44,12 @@ build() {
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
+  sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
+	lib/libid3tag/libid3tag/configure.ac \
+	lib/libdvd/libdvdcss/configure.ac
+
+  patch -p1 <$srcdir/cdio.patch
+
   # Bootstrapping XBMC
   ./bootstrap
 
diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch
new file mode 100644
index 000000000..0f74deaa4
--- /dev/null
+++ b/community/xbmc/cdio.patch
@@ -0,0 +1,39 @@
+diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
+--- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-03-22 02:07:50.000000000 +0400
++++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2013-01-09 14:40:10.670040454 +0400
+@@ -27,6 +27,10 @@
+ #include "storage/MediaManager.h"
+ #include "utils/log.h"
+ 
++#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
++#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
++#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
++
+ using namespace MUSIC_INFO;
+ 
+ #ifdef HAS_DVD_DRIVE
+diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp
+--- xbmc-11.0/xbmc/storage/cdioSupport.cpp	2012-03-22 02:07:50.000000000 +0400
++++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp	2013-01-09 14:51:40.276801092 +0400
+@@ -648,15 +648,18 @@
+   CSingleLock lock(*m_cdio);
+ 
+   // Get the CD-Text , if any
+-  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
++  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio);
+ 
+   if (pcdtext == NULL)
+     return ;
+ 
+   // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe.
+   for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
+-    if (pcdtext->field[i])
+-      xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i];
++  {
++    char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum);
++    if (data != NULL)
++      xcdt[(cdtext_field_t)i] = data;
++  }
+ }
+ 
+ CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)
diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service
index 23756cf03..431582f1b 100644
--- a/community/xbmc/xbmc.service
+++ b/community/xbmc/xbmc.service
@@ -6,7 +6,7 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
 Restart = always
 
 [Install]