Fri Mar 22 00:05:47 PDT 2013

2 files changed, 6 insertions, 53 deletions

diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index 1601e1e13..0d7e662b4 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83330 2013-01-29 17:21:13Z spupykin $
+# $Id: PKGBUILD 86733 2013-03-21 16:26:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -8,8 +8,8 @@
 _prefix=/usr
 
 pkgname=xbmc
-pkgver=12.0
-pkgrel=1
+pkgver=12.1
+pkgrel=3
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -33,11 +33,9 @@ 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"
-	"cdio.patch")
-md5sums=('a79128b9d094a046947bfd9bb4550809'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
+	"xbmc.service")
+md5sums=('8955473f84cb2a0513c0f3efd7e68843'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -45,12 +43,6 @@ 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
deleted file mode 100644
index 0f74deaa4..000000000
--- a/community/xbmc/cdio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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)